Commit Graph

97 Commits

Author SHA1 Message Date
Luigi Rizzo b569ebd593 more simplifications
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24460 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-03 17:07:56 +00:00
Luigi Rizzo 5f612f9ae6 consistent rule for goto...
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24431 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-03 16:58:16 +00:00
Luigi Rizzo e5b0c721e5 remove another useless nonterminal
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24430 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-03 16:46:55 +00:00
Luigi Rizzo 34d67f7d09 remove a useless nonterminal
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24429 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-03 16:38:50 +00:00
Luigi Rizzo 49227c7ba1 more simplifications
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24428 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-03 16:37:14 +00:00
Luigi Rizzo 7695df3896 remove more shift-reduce conflicts
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24427 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-03 16:34:31 +00:00
Luigi Rizzo 820ef22951 remove a redundant rule
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24426 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-03 16:33:00 +00:00
Luigi Rizzo 673607f87a reduce shift/reduce warnings
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24425 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-03 16:28:48 +00:00
Luigi Rizzo 9ebc190fdc simplify case_statements
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24424 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-03 16:12:31 +00:00
Luigi Rizzo e2e92e49a6 switch statement in one place
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24423 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-03 16:08:35 +00:00
Luigi Rizzo 7cc4511fa2 common syntax for context name
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24421 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-03 16:00:49 +00:00
Luigi Rizzo 34dcc89e24 another instance of context name
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24344 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-02 20:50:18 +00:00
Luigi Rizzo 7a625b894d fix a bug previously introduced in the handling of timespec.
Fortunately we have regression tests!



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24343 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-02 20:44:56 +00:00
Luigi Rizzo 0cf25becb9 simplify case statements
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24341 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-02 20:18:02 +00:00
Luigi Rizzo 05d2b78132 one more instance of assignment
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24340 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-02 20:13:58 +00:00
Luigi Rizzo 0e8e343e1f global_statement is really an assignment statement
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24339 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-02 20:11:24 +00:00
Luigi Rizzo b222d1247f expressions used in if, while, switch are all of the same kind
(it remains to see why 'random' gives 16 shift/reduce conflicts...)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24292 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-02 19:17:49 +00:00
Luigi Rizzo 99dec41a4c macro statements can be empty
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24258 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-02 18:51:33 +00:00
Luigi Rizzo 65b8f8365e empty arglists are valid
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24257 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-02 18:48:47 +00:00
Luigi Rizzo 3173305448 rename the rule for context names properly
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24256 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-02 18:45:18 +00:00
Luigi Rizzo 9eaa57bebc simplify handling of 'include' lists
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24255 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-02 18:41:57 +00:00
Luigi Rizzo 827abbf46e ... and use a single rule for timespec
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24254 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-02 18:33:15 +00:00
Luigi Rizzo 7b10b81a58 use a single rule to parse timeranges hh:mm-hh:mm
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24252 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-02 18:23:41 +00:00
Luigi Rizzo 5c940c74a6 if/ifTime/random statements are all the same thing
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24248 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-02 18:08:27 +00:00
Luigi Rizzo 16f94523ad includedname is just a regular word_or_default name,
no need for a separate nonterminal


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24219 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-02 17:58:57 +00:00
Luigi Rizzo df3f8aa2b9 remove useless 'extern' declaration
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24216 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-02 17:37:33 +00:00
Luigi Rizzo 5cbf333fee remove some unneeded local variables.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24178 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-02 14:27:19 +00:00
Luigi Rizzo f262d06975 more usage of nword(). I think the references to source
line/columns are also correct now.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24175 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-02 14:25:01 +00:00
Luigi Rizzo d8e1ad052a more simplifications involving linku1
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24174 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-02 14:12:01 +00:00
Luigi Rizzo 182a536722 correct linku1() to handle the case tail = NULL correctly.
Now the function can be used to simplify other conditional blocks.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24173 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-02 14:08:18 +00:00
Russell Bryant 34e0ae0e6a The build of aelparse was still broken in some cases, so instead of having to
keep figuring out workarounds for build issues on various platforms, just go
ahead and remove what started all of this.  Two instances of ast_calloc have
been changed to calloc in pbx/ael/ael.y.

ast_copy_string isn't actually needed here because the only place it is used is
in ast_expr2f.c.  However, the utils Makefile already builds its own
ast_expr2f.o with -DSTANDALONE, which makes it use strncpy instead of
ast_copy_string.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@24115 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-02 03:03:27 +00:00
Luigi Rizzo c305fb082d more simplifications
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23807 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-01 00:31:47 +00:00
Luigi Rizzo 01360f6440 always trim the trailing ';'
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23806 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-01 00:27:27 +00:00
Luigi Rizzo 33167fc41c comment usage of contexts
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23805 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-01 00:20:11 +00:00
Luigi Rizzo 2c2f7e817b fix dereferencing freed memory
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23795 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-05-01 00:02:12 +00:00
Luigi Rizzo 595955ea98 switch a couple of operands.
This gives slightly different results from the previous code
on syntax errors, but it actually makes fewer mistakes so
i think it is an improvement. Additionally, it makes the
code more uniform (the other call of reset_argcount
occurs after LP and not before).
 


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23783 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-30 23:53:22 +00:00
Luigi Rizzo 8faa2e7d44 put back some simplifications, this time really tested
(ael_lex.c manually deleted, runtest passed)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23782 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-30 23:31:43 +00:00
Luigi Rizzo db14f6b107 revert ael.flex to the last correct version.
For some reason the makefile did not regenerate the
ael_lex.c file correctly so i was not testing the changes.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23781 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-30 23:21:49 +00:00
Luigi Rizzo 44f43f9eb1 another small set of simplifications
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23780 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-30 23:04:58 +00:00
Luigi Rizzo c22ef69d1f simplify logic (runtest passed).
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23758 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-30 22:56:41 +00:00
Luigi Rizzo 85480376f7 more nword() usages, and mark some dubious places.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23669 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-30 14:06:04 +00:00
Luigi Rizzo f239ec2080 introduce a new frontend to npval for the very common case
of creating an object for a tring value PV_WORD.
Start using it.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23640 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-30 13:57:08 +00:00
Luigi Rizzo 5e746bf38f another client for switchlist_block
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23615 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-30 12:46:15 +00:00
Luigi Rizzo 813f565de7 more merge of common blocks through intermediate rules.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23614 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-30 12:44:54 +00:00
Luigi Rizzo f4b05f86cc make destroy_pval able to handle a NULL value
(the warning should be removed);
define a 'elements_block' rule to simplify some other rules
removing duplicated code - runtests seems happy with this.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23613 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-30 12:30:08 +00:00
Luigi Rizzo ce05a548c3 remove some commented-out code
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23612 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-30 12:14:33 +00:00
Luigi Rizzo 36a26a9197 simplify updating the token position markers
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23611 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-30 12:12:39 +00:00
Luigi Rizzo c5f779d0a0 more comments
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23557 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-30 09:24:04 +00:00
Luigi Rizzo 9a8a037250 comment some code
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23550 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-30 09:06:28 +00:00
Luigi Rizzo 6eb6343d9a more simplifications in the bison sources,
more annotation with XXX of dubious code.
(The code still passes tests)



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23534 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-30 08:21:46 +00:00