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

Regenerated parser.

This commit is contained in:
Gunnar Beutner 2012-05-31 09:49:12 +02:00
parent 3c92c7b2d7
commit 11536f51fd
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dyn/Makefile.am
View File

@ -11,7 +11,7 @@ AM_YFLAGS = -d
libdyn_la_SOURCES = \ libdyn_la_SOURCES = \
configcontext.cpp \ configcontext.cpp \
configcontext.h \ configcontext.h \
config_lexer.ll config_lexer.ll \
config_parser.yy \ config_parser.yy \
i2-dyn.h \ i2-dyn.h \
dynamicobject.cpp \ dynamicobject.cpp \

18
dyn/config_parser.cc
View File

@ -67,7 +67,7 @@
/* Line 268 of yacc.c */ /* Line 268 of yacc.c */
#line 71 "icinga_parser.cc" #line 71 "config_parser.cc"
/* Enabling traces. */ /* Enabling traces. */
#ifndef YYDEBUG #ifndef YYDEBUG
@ -134,7 +134,7 @@ typedef union YYSTYPE
{ {
/* Line 293 of yacc.c */ /* Line 293 of yacc.c */
#line 10 "icinga_parser.yy" #line 10 "config_parser.yy"
char *text; char *text;
int num; int num;
@ -142,7 +142,7 @@ typedef union YYSTYPE
/* Line 293 of yacc.c */ /* Line 293 of yacc.c */
#line 146 "icinga_parser.cc" #line 146 "config_parser.cc"
} YYSTYPE; } YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@ -166,9 +166,9 @@ typedef struct YYLTYPE
/* Copy the second part of user declarations. */ /* Copy the second part of user declarations. */
/* Line 343 of yacc.c */ /* Line 343 of yacc.c */
#line 30 "icinga_parser.yy" #line 30 "config_parser.yy"
#include "i2-configfile.h" #include "i2-dyn.h"
using namespace icinga; using namespace icinga;
@ -181,7 +181,7 @@ void yyerror(YYLTYPE *locp, ConfigContext *context, const char *err)
message << locp->first_line << ":" << locp->first_column message << locp->first_line << ":" << locp->first_column
<< "-" << "-"
<< locp->last_line << ":" << locp->last_column << locp->last_line << ":" << locp->last_column
<< ": " << err << std::endl; << ": " << err << endl;
throw runtime_error(message.str()); throw runtime_error(message.str());
} }
@ -191,7 +191,7 @@ void yyerror(YYLTYPE *locp, ConfigContext *context, const char *err)
/* Line 343 of yacc.c */ /* Line 343 of yacc.c */
#line 195 "icinga_parser.cc" #line 195 "config_parser.cc"
#ifdef short #ifdef short
# undef short # undef short
@ -1498,7 +1498,7 @@ yyreduce:
/* Line 1806 of yacc.c */ /* Line 1806 of yacc.c */
#line 1502 "icinga_parser.cc" #line 1502 "config_parser.cc"
default: break; default: break;
} }
/* User semantic actions sometimes alter yychar, and that requires /* User semantic actions sometimes alter yychar, and that requires
@ -1736,6 +1736,6 @@ yyreturn:
/* Line 2067 of yacc.c */ /* Line 2067 of yacc.c */
#line 109 "icinga_parser.yy" #line 109 "config_parser.yy"

4
dyn/config_parser.h
View File

@ -77,7 +77,7 @@ typedef union YYSTYPE
{ {
/* Line 2068 of yacc.c */ /* Line 2068 of yacc.c */
#line 10 "icinga_parser.yy" #line 10 "config_parser.yy"
char *text; char *text;
int num; int num;
@ -85,7 +85,7 @@ typedef union YYSTYPE
/* Line 2068 of yacc.c */ /* Line 2068 of yacc.c */
#line 89 "icinga_parser.h" #line 89 "config_parser.h"
} YYSTYPE; } YYSTYPE;
# define YYSTYPE_IS_TRIVIAL 1 # define YYSTYPE_IS_TRIVIAL 1
# define yystype YYSTYPE /* obsolescent; will be withdrawn */ # define yystype YYSTYPE /* obsolescent; will be withdrawn */

2
dyn/config_parser.yy
View File

@ -28,7 +28,7 @@
%token T_INHERITS %token T_INHERITS
%{ %{
#include "i2-configfile.h" #include "i2-dyn.h"
using namespace icinga; using namespace icinga;