diff options
author | Steve Murphy <murf@digium.com> | 2009-03-03 22:12:02 +0000 |
---|---|---|
committer | Steve Murphy <murf@digium.com> | 2009-03-03 22:12:02 +0000 |
commit | f47b03877b87d725b8ab442936df792c2c352aee (patch) | |
tree | f2b0c043937f25671fdcfb3e1e3affc6b476b783 /main/ast_expr2.h | |
parent | ae786501f15a62b98357369903bf3c1f711bb398 (diff) |
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: https://origsvn.digium.com/svn/asterisk/trunk@179973 65c4cc65-6c06-0410-ace0-fbb531ad65f3
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 5bf60f71a..2d6dc479c 100644 --- a/main/ast_expr2.h +++ b/main/ast_expr2.h @@ -94,7 +94,7 @@ #if ! defined YYSTYPE && ! defined YYSTYPE_IS_DECLARED typedef union YYSTYPE -#line 344 "ast_expr2.y" +#line 345 "ast_expr2.y" { struct val *val; struct expr_node *arglist; |