From d76e4b2a5b0e386a9d85f83af117871dbe6faaae Mon Sep 17 00:00:00 2001 From: Gunnar Beutner Date: Thu, 31 May 2012 09:18:26 +0200 Subject: [PATCH] Regenerated parser. --- components/configfile/icinga_lexer.cc | 56 +++++++++++++------------- components/configfile/icinga_lexer.ll | 1 + components/configfile/icinga_parser.cc | 19 ++++----- 3 files changed, 39 insertions(+), 37 deletions(-) diff --git a/components/configfile/icinga_lexer.cc b/components/configfile/icinga_lexer.cc index a4f69f837..cd05cccec 100644 --- a/components/configfile/icinga_lexer.cc +++ b/components/configfile/icinga_lexer.cc @@ -502,10 +502,11 @@ static yyconst flex_int32_t yy_rule_can_match_eol[23] = #define YY_RESTORE_YY_MORE_OFFSET #line 1 "icinga_lexer.ll" #line 2 "icinga_lexer.ll" -#include -#include "configcontext.h" +#include "i2-configfile.h" #include "icinga_parser.h" +using namespace icinga; + #define YY_EXTRA_TYPE ConfigContext * #define YY_USER_ACTION yylloc->first_line = yylineno; @@ -514,8 +515,7 @@ do { \ yyextra->Input->read(buf, max_size); \ result = yyextra->Input->gcount(); \ } while (0) - -#define YY_NO_UNISTD_H +#define YY_NO_UNISTD_H 1 #line 521 "icinga_lexer.cc" @@ -764,7 +764,7 @@ YY_DECL register int yy_act; struct yyguts_t * yyg = (struct yyguts_t*)yyscanner; -#line 24 "icinga_lexer.ll" +#line 23 "icinga_lexer.ll" #line 770 "icinga_lexer.cc" @@ -863,119 +863,119 @@ do_action: /* This label is used only to access EOF actions. */ case 1: YY_RULE_SETUP -#line 25 "icinga_lexer.ll" +#line 24 "icinga_lexer.ll" return T_ABSTRACT; YY_BREAK case 2: YY_RULE_SETUP -#line 26 "icinga_lexer.ll" +#line 25 "icinga_lexer.ll" return T_LOCAL; YY_BREAK case 3: YY_RULE_SETUP -#line 27 "icinga_lexer.ll" +#line 26 "icinga_lexer.ll" return T_OBJECT; YY_BREAK case 4: YY_RULE_SETUP -#line 28 "icinga_lexer.ll" +#line 27 "icinga_lexer.ll" return T_INCLUDE; YY_BREAK case 5: YY_RULE_SETUP -#line 29 "icinga_lexer.ll" +#line 28 "icinga_lexer.ll" return T_INHERITS; YY_BREAK case 6: YY_RULE_SETUP -#line 30 "icinga_lexer.ll" +#line 29 "icinga_lexer.ll" return T_IDENTIFIER; YY_BREAK case 7: /* rule 7 can match eol */ YY_RULE_SETUP -#line 31 "icinga_lexer.ll" +#line 30 "icinga_lexer.ll" { yytext[yyleng-1] = '\0'; yylval->text = strdup(yytext + 1); return T_STRING; } YY_BREAK case 8: YY_RULE_SETUP -#line 32 "icinga_lexer.ll" +#line 31 "icinga_lexer.ll" { yylval->num = atoi(yytext); return T_NUMBER; } YY_BREAK case 9: YY_RULE_SETUP -#line 33 "icinga_lexer.ll" +#line 32 "icinga_lexer.ll" return T_OPEN_BRACE; YY_BREAK case 10: YY_RULE_SETUP -#line 34 "icinga_lexer.ll" +#line 33 "icinga_lexer.ll" return T_CLOSE_BRACE; YY_BREAK case 11: YY_RULE_SETUP -#line 35 "icinga_lexer.ll" +#line 34 "icinga_lexer.ll" return T_OPEN_BRACKET; YY_BREAK case 12: YY_RULE_SETUP -#line 36 "icinga_lexer.ll" +#line 35 "icinga_lexer.ll" return T_CLOSE_BRACKET; YY_BREAK case 13: YY_RULE_SETUP -#line 37 "icinga_lexer.ll" +#line 36 "icinga_lexer.ll" return T_COMMA; YY_BREAK case 14: YY_RULE_SETUP -#line 38 "icinga_lexer.ll" +#line 37 "icinga_lexer.ll" return T_EQUAL; YY_BREAK case 15: YY_RULE_SETUP -#line 41 "icinga_lexer.ll" +#line 40 "icinga_lexer.ll" BEGIN(IN_C_COMMENT); YY_BREAK case 16: YY_RULE_SETUP -#line 45 "icinga_lexer.ll" +#line 44 "icinga_lexer.ll" BEGIN(INITIAL); YY_BREAK case 17: /* rule 17 can match eol */ YY_RULE_SETUP -#line 46 "icinga_lexer.ll" +#line 45 "icinga_lexer.ll" /* ignore comment */ YY_BREAK case 18: YY_RULE_SETUP -#line 47 "icinga_lexer.ll" +#line 46 "icinga_lexer.ll" /* ignore star */ YY_BREAK case 19: YY_RULE_SETUP -#line 50 "icinga_lexer.ll" +#line 49 "icinga_lexer.ll" /* ignore C++-style comments */ YY_BREAK case 20: YY_RULE_SETUP -#line 51 "icinga_lexer.ll" +#line 50 "icinga_lexer.ll" /* ignore shell-style comments */ YY_BREAK case 21: /* rule 21 can match eol */ YY_RULE_SETUP -#line 52 "icinga_lexer.ll" +#line 51 "icinga_lexer.ll" /* ignore whitespace */ YY_BREAK case 22: YY_RULE_SETUP -#line 53 "icinga_lexer.ll" +#line 52 "icinga_lexer.ll" ECHO; YY_BREAK #line 982 "icinga_lexer.cc" @@ -2166,7 +2166,7 @@ void yyfree (void * ptr , yyscan_t yyscanner) #define YYTABLES_NAME "yytables" -#line 53 "icinga_lexer.ll" +#line 52 "icinga_lexer.ll" diff --git a/components/configfile/icinga_lexer.ll b/components/configfile/icinga_lexer.ll index 89d33cd76..c0af41a24 100644 --- a/components/configfile/icinga_lexer.ll +++ b/components/configfile/icinga_lexer.ll @@ -1,5 +1,6 @@ %{ #include "i2-configfile.h" +#include "icinga_parser.h" using namespace icinga; diff --git a/components/configfile/icinga_parser.cc b/components/configfile/icinga_parser.cc index b8093ba6e..0f44e3f36 100644 --- a/components/configfile/icinga_parser.cc +++ b/components/configfile/icinga_parser.cc @@ -168,8 +168,9 @@ typedef struct YYLTYPE /* Line 343 of yacc.c */ #line 30 "icinga_parser.yy" -#include -#include "configcontext.h" +#include "i2-configfile.h" + +using namespace icinga; int yylex(YYSTYPE *lvalp, YYLTYPE *llocp, void *scanner); @@ -186,7 +187,7 @@ void yyerror(YYLTYPE *locp, ConfigContext *context, const char *err) /* Line 343 of yacc.c */ -#line 190 "icinga_parser.cc" +#line 191 "icinga_parser.cc" #ifdef short # undef short @@ -485,10 +486,10 @@ static const yytype_int8 yyrhs[] = /* YYRLINE[YYN] -- source line where rule number YYN was defined. */ static const yytype_uint8 yyrline[] = { - 0, 49, 49, 50, 53, 53, 56, 59, 60, 63, - 66, 67, 70, 71, 74, 75, 78, 79, 82, 85, - 86, 87, 90, 93, 93, 93, 93, 96, 99, 101, - 102 + 0, 50, 50, 51, 54, 54, 57, 60, 61, 64, + 67, 68, 71, 72, 75, 76, 79, 80, 83, 86, + 87, 88, 91, 94, 94, 94, 94, 97, 100, 102, + 103 }; #endif @@ -1493,7 +1494,7 @@ yyreduce: /* Line 1806 of yacc.c */ -#line 1497 "icinga_parser.cc" +#line 1498 "icinga_parser.cc" default: break; } /* User semantic actions sometimes alter yychar, and that requires @@ -1731,6 +1732,6 @@ yyreturn: /* Line 2067 of yacc.c */ -#line 104 "icinga_parser.yy" +#line 105 "icinga_parser.yy" -- 2.40.0