tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix line continuation support for parentheses 

fixes #8679
This commit is contained in:
Gunnar Beutner 2015-03-11 09:55:38 +01:00
parent ca27c8769e
commit 8682c530af
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/config/config_lexer.ll
View File

@ -251,7 +251,9 @@ in return T_IN;
\> return T_GREATER_THAN; \> return T_GREATER_THAN;
} }
[\r\n]+ { yycolumn -= strlen(yytext) - 1; if (!yyextra->m_IgnoreNewlines) return T_NEWLINE; } \( { yyextra->m_IgnoreNewlines++; return '('; }
\) { yyextra->m_IgnoreNewlines--; return ')'; }
[\r\n]+ { yycolumn -= strlen(yytext) - 1; if (!yyextra->m_IgnoreNewlines) { return T_NEWLINE; } }
<<EOF>> { if (!yyextra->m_Eof) { yyextra->m_Eof = true; return T_NEWLINE; } else { yyterminate(); } } <<EOF>> { if (!yyextra->m_Eof) { yyextra->m_Eof = true; return T_NEWLINE; } else { yyterminate(); } }
. return yytext[0]; . return yytext[0];

4
lib/config/config_parser.yy
View File

@ -907,11 +907,11 @@ rterm_no_side_effect: T_STRING
} }
| '(' | '('
{ {
context->m_IgnoreNewlines++; context->m_OpenBraces++;
} }
rterm ')' rterm ')'
{ {
context->m_IgnoreNewlines--; context->m_OpenBraces--;
$$ = $3; $$ = $3;
} }
| rterm T_LOGICAL_OR rterm { MakeRBinaryOp<LogicalOrExpression>(&$$, $1, $3, @1, @3); } | rterm T_LOGICAL_OR rterm { MakeRBinaryOp<LogicalOrExpression>(&$$, $1, $3, @1, @3); }