diff options
| author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-03 23:26:54 +0000 |
|---|---|---|
| committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-03 23:26:54 +0000 |
| commit | 5d81fa4632200e814e7374e5f05460fcfeafc38a (patch) | |
| tree | a400860f7ad893b7d144c4109599628dacaedaa3 /main/ast_expr2.h | |
| parent | a6059a815b240ac476ba8aff43afc0e6ef926646 (diff) | |
Merged revisions 179973 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r179973 | murf | 2009-03-03 15:12:02 -0700 (Tue, 03 Mar 2009) | 33 lines
Merged revisions 179807 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
I had some work to do to port these changes to trunk; the
check_expr stuff hasn't been updated here for quite some
time, it appears. I added some more tests to the check_expr2
suite. I had to play around with the makefile a bit, etc.
I added STANDALONE2 #ifdefs to ast_expr2.y so as not to
conflict structure with aelparse.
........
r179807 | murf | 2009-03-03 11:11:34 -0700 (Tue, 03 Mar 2009) | 19 lines
These changes allow AEL to better check ${} constructs within $[...], that are concatenated with text.
I modified and added rules in ast_expr2.fl to better handle
the concatenations.
I added some default routines to ast_expr2.y so the standalone would
compile. It also looks like I haven't run this thru bison since 2.1, so
it's good to get this updated.
The Makefile has comments added now for check_expr2 and check_expr to
explain what they are for, and how to run them.
The testexpr2s stuff has been removed, in favor of check_expr2.
expr2.testinput has been updated to include the two expressions
that inspired these changes (from mcnobody on #asterisk this morning)
The regression has been run and all looks well.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@180058 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/ast_expr2.h')
| -rw-r--r-- | main/ast_expr2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/ast_expr2.h b/main/ast_expr2.h index 2cb7e1a98..82140bf65 100644 --- a/main/ast_expr2.h +++ b/main/ast_expr2.h @@ -92,7 +92,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 343 "ast_expr2.y" +#line 344 "ast_expr2.y" { struct val *val; struct expr_node *arglist; |