diff options
| author | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-22 10:04:40 +0200 |
|---|---|---|
| committer | Rainer Gerhards <rgerhards@adiscon.com> | 2013-10-22 10:04:40 +0200 |
| commit | 31bf5b8bae41b8a65697ae07413fd36631c0751c (patch) | |
| tree | e464c7097328a013e65e49242c3caf0d0ac92ee8 /grammar | |
| parent | 0af5062e9a94d17653818c3a220a1f97cdf9f005 (diff) | |
| download | rsyslog-31bf5b8bae41b8a65697ae07413fd36631c0751c.tar.gz rsyslog-31bf5b8bae41b8a65697ae07413fd36631c0751c.tar.bz2 rsyslog-31bf5b8bae41b8a65697ae07413fd36631c0751c.zip | |
remove global variable support
The original idea was not well thought out and global variables, as
implemented, worked far different from what anybody would expect. As
such, we consider the current approach as an experiment that did not
work out and opt to removing it, clearing the way for a better future
solution. Note: global vars were introduced in 7.5.3 on Sept, 11th 2013.
Diffstat (limited to 'grammar')
| -rw-r--r-- | grammar/lexer.l | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/grammar/lexer.l b/grammar/lexer.l index d254d47e..f1b29755 100644 --- a/grammar/lexer.l +++ b/grammar/lexer.l @@ -9,7 +9,7 @@ * cases. So while we hope that cfsysline support can be dropped some time in * the future, we will probably keep these useful constructs. * - * Copyright 2011-2012 Rainer Gerhards and Adiscon GmbH. + * Copyright 2011-2013 Rainer Gerhards and Adiscon GmbH. * * This file is part of the rsyslog runtime library. * @@ -129,7 +129,7 @@ int fileno(FILE *stream); <EXPR>0[0-7]+ | /* octal number */ <EXPR>0x[0-7a-f] | /* hex number, following rule is dec; strtoll handles all! */ <EXPR>([1-9][0-9]*|0) { yylval.n = strtoll(yytext, NULL, 0); return NUMBER; } -<EXPR>\$[$!./]{0,1}[a-z][!a-z0-9\-_\.]* { yylval.s = strdup(yytext); return VAR; } +<EXPR>\$[$!.]{0,1}[a-z][!a-z0-9\-_\.]* { yylval.s = strdup(yytext); return VAR; } <EXPR>\'([^'\\]|\\['"\\$bntr]|\\x[0-9a-f][0-9a-f]|\\[0-7][0-7][0-7])*\' { yytext[yyleng-1] = '\0'; unescapeStr((uchar*)yytext+1, yyleng-2); |