Commit Graph

133 Commits

Author SHA1 Message Date
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
Luigi Rizzo
c7a892d5f9 make the 'runtest' filter less strict on line numbers.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23154 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-28 15:51:31 +00:00
Luigi Rizzo
d30ead1474 simplify handling of line numbers
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23153 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-28 15:42:13 +00:00
Luigi Rizzo
dad2812867 fix last known bug in computing columb numbers in error messages
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23152 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-28 15:33:05 +00:00
Luigi Rizzo
c1366df3d5 fix a bug in computing line numbers
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23151 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-28 15:24:30 +00:00
Luigi Rizzo
799126216e - fix miscalculation in column numbers when multiple tabs
or empty lines are involved;
- change linku1() to return the head of the list (unused at the moment);
- ignore the source line number in runtests as they change with the
  source and cause mismatches in the comparison with the reference output.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23130 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-28 14:17:03 +00:00
Luigi Rizzo
43bfe82828 last batch of npval -> npval2 changes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23109 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-28 11:20:21 +00:00
Luigi Rizzo
5291b89f30 more npval -> npval2 changes
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23088 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-28 10:06:10 +00:00
Luigi Rizzo
c9816d135d more npval -> npval2 conversions
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23066 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-28 06:26:27 +00:00
Luigi Rizzo
304fbbd1b6 fix destructor for pval objects (thanks to Steve Murphy);
rearrange initial part of ael.flex for flexibility.


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@23011 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-27 21:09:52 +00:00
Luigi Rizzo
85ea0974f8 always call the destructor
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22989 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-27 20:23:49 +00:00
Luigi Rizzo
456e27b453 document variable and options used.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22988 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-27 20:08:42 +00:00
Luigi Rizzo
810e701b1e document options, move objects of the same type close to
each other so it is evident what they are.



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22958 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-27 19:51:59 +00:00
Luigi Rizzo
9033ecfaa2 slightly restructure a block to reduce nesting,
mark some missing error checks



git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22957 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-27 19:29:14 +00:00
Luigi Rizzo
f0d3175793 imore npval -> npval2 conversions
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@22955 65c4cc65-6c06-0410-ace0-fbb531ad65f3
2006-04-27 19:14:07 +00:00