summaryrefslogtreecommitdiffstats
path: root/grammar
diff options
context:
space:
mode:
authorRainer Gerhards <rgerhards@adiscon.com>2012-10-04 07:48:27 +0200
committerRainer Gerhards <rgerhards@adiscon.com>2012-10-04 07:48:27 +0200
commit83de403d50bc2b1ca8a690f969434c7ea7b9df2c (patch)
tree8a6a6aa6276ba7487de9b35b4abd4c59d947a859 /grammar
parentdf90450d962b79fb59897fd9d2bd21292277256e (diff)
parent5ac39a620787ea995b0029a9d01598074f84b717 (diff)
downloadrsyslog-83de403d50bc2b1ca8a690f969434c7ea7b9df2c.tar.gz
rsyslog-83de403d50bc2b1ca8a690f969434c7ea7b9df2c.tar.xz
rsyslog-83de403d50bc2b1ca8a690f969434c7ea7b9df2c.zip
Merge branch 'v6-stable' into beta
Diffstat (limited to 'grammar')
-rw-r--r--grammar/lexer.l1
1 files changed, 1 insertions, 0 deletions
diff --git a/grammar/lexer.l b/grammar/lexer.l
index 76b1298c..ce7c34c5 100644
--- a/grammar/lexer.l
+++ b/grammar/lexer.l
@@ -211,6 +211,7 @@ int fileno(FILE *stream);
/*yylval.estr = es_newStrFromBuf(yytext+1, yyleng-2);
return VALUE; }*/
"/*" { preCommentState = YY_START; BEGIN COMMENT; }
+<INOBJ>"/*" { preCommentState = YY_START; BEGIN COMMENT; }
<EXPR>"/*" { preCommentState = YY_START; BEGIN COMMENT; }
<COMMENT>"*/" { BEGIN preCommentState; }
<COMMENT>([^*]|\n)+|.