From 77a1dcab9bd7a544fd13397c53c64b0468e7ccf2 Mon Sep 17 00:00:00 2001 From: Felipe Zimmerle Date: Thu, 11 Feb 2016 16:42:39 -0300 Subject: [PATCH] parser: fix issue with skipAfter action Considering \n and/or \r as the end of the token. --- src/parser/seclang-scanner.ll | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/parser/seclang-scanner.ll b/src/parser/seclang-scanner.ll index def7903b..c81bda2b 100755 --- a/src/parser/seclang-scanner.ll +++ b/src/parser/seclang-scanner.ll @@ -158,11 +158,12 @@ CONFIG_VALUE_NUMBER [0-9]+ FREE_TEXT ([^\"]|(\\\"))+ +NEW_LINE_FREE_TEXT [^, \t\"\n\r]+ FREE_TEXT_NEW_LINE [^\"|\n]+ FREE_TEXT_QUOTE ([^\']|([^\\]\\\'))+ FREE_TEXT_SPACE [^ \t]+ FREE_TEXT_SPACE_COMMA [^, \t]+ -FREE_TEXT_SPACE_COMMA_QUOTE [^, \t\"]+ +FREE_TEXT_SPACE_COMMA_QUOTE [^, \t\"\n\r]+ FREE_TEXT_QUOTE_COMMA [^,\']+ COL_NAME [A-Za-z]+ @@ -300,7 +301,7 @@ CONFIG_DIR_UNICODE_MAP_FILE (?i:SecUnicodeMapFile) {CONFIG_DIR_SEC_ACTION} { return yy::seclang_parser::make_CONFIG_DIR_SEC_ACTION(yytext, *driver.loc.back()); } {CONFIG_DIR_SEC_DEFAULT_ACTION} { return yy::seclang_parser::make_CONFIG_DIR_SEC_DEFAULT_ACTION(yytext, *driver.loc.back()); } -{CONFIG_DIR_SEC_MARKER}[ ]{FREE_TEXT_NEW_LINE} { return yy::seclang_parser::make_CONFIG_DIR_SEC_MARKER(strchr(yytext, ' ') + 1, *driver.loc.back()); } +{CONFIG_DIR_SEC_MARKER}[ ]{NEW_LINE_FREE_TEXT} { return yy::seclang_parser::make_CONFIG_DIR_SEC_MARKER(strchr(yytext, ' ') + 1, *driver.loc.back()); } { {SOMETHING} { BEGIN(INITIAL); return yy::seclang_parser::make_FREE_TEXT(yytext, *driver.loc.back()); }