diff options
| author | Steve Murphy <murf@digium.com> | 2008-04-21 21:13:02 +0000 |
|---|---|---|
| committer | Steve Murphy <murf@digium.com> | 2008-04-21 21:13:02 +0000 |
| commit | c0b8f57b9d360f7c7353dcce2b2f9d911aa407a6 (patch) | |
| tree | e783203f7d0fa05d28feb3bc509c19bc885d2666 /main/ast_expr2.fl | |
| parent | b43364eac85e0773732ac4d54262cb742ba9ace4 (diff) | |
(closes issue #12467)
Reported by: atis
Tested by: murf
This upgrade adds the ~~ (concatenation) string operator to expr2.
While not needed in normal runtime pbx operation, it is needed when
raw exprs are being syntax checked. This plays into future syntax-
unification plans. By permission of atis, this addition in trunk
and the reason of why things are as they are will suffice to close
this bug.
I also added a short note about the previous addition of "sip show sched"
to the CLI in CHANGES, which I discovered I forgot in a previous commit.
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@114423 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/ast_expr2.fl')
| -rw-r--r-- | main/ast_expr2.fl | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/ast_expr2.fl b/main/ast_expr2.fl index 723eebf5a..c926913e8 100644 --- a/main/ast_expr2.fl +++ b/main/ast_expr2.fl @@ -133,6 +133,7 @@ static char *expr2_token_subst(const char *mess); \&\& { SET_COLUMNS; SET_STRING; return TOK_AND;} \=\= { SET_COLUMNS; SET_STRING; return TOK_EQ;} \=~ { SET_COLUMNS; SET_STRING; return TOK_EQTILDE;} +\~~ { SET_COLUMNS; SET_STRING; return TOK_TILDETILDE;} \> { SET_COLUMNS; SET_STRING; return TOK_GT;} \< { SET_COLUMNS; SET_STRING; return TOK_LT;} \>\= { SET_COLUMNS; SET_STRING; return TOK_GE;} @@ -173,7 +174,7 @@ static char *expr2_token_subst(const char *mess); return TOKEN; } -([a-zA-Z0-9\.';\\_^$#@]|[\x80-\xff])+ { +([a-zA-Z0-9\.';\\_^#@]|[\x80-\xff]|($[^{]))+ { SET_COLUMNS; SET_STRING; return TOKEN; |