Regenerated parser.

diff --git a/dyn/Makefile.am b/dyn/Makefile.am
index 7987149bb67aaca39ebbd4c2d70d317e81119413..72ad1daa3fdfedfc0e9991736b0b79e5b374a8b0 100644 (file)
--- a/dyn/Makefile.am
+++ b/dyn/Makefile.am
@@ -11,7 +11,7 @@ AM_YFLAGS = -d
 libdyn_la_SOURCES = \
        configcontext.cpp \
        configcontext.h \
-       config_lexer.ll
+       config_lexer.ll \
        config_parser.yy \
        i2-dyn.h \
        dynamicobject.cpp \

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

diff --git a/dyn/config_parser.h b/dyn/config_parser.h
index 4f4432db5db93fbda6b224d85f6a7c0223405983..407779cf6a7ce660d103c237126fa3c851e036b9 100644 (file)
--- a/dyn/config_parser.h
+++ b/dyn/config_parser.h
@@ -77,7 +77,7 @@ typedef union YYSTYPE
 {
 
 /* Line 2068 of yacc.c  */
-#line 10 "icinga_parser.yy"
+#line 10 "config_parser.yy"
 
        char *text;
        int num;
@@ -85,7 +85,7 @@ typedef union YYSTYPE
 
 
 /* Line 2068 of yacc.c  */
-#line 89 "icinga_parser.h"
+#line 89 "config_parser.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */

diff --git a/dyn/config_parser.yy b/dyn/config_parser.yy
index 0432255b9abcecb03f3e948fd8e3d8c5e702d2ca..bdce167c87864eec35614745bae9c706e8fe9dc0 100644 (file)
--- a/dyn/config_parser.yy
+++ b/dyn/config_parser.yy
@@ -28,7 +28,7 @@
 %token T_INHERITS
 
 %{
-#include "i2-configfile.h"
+#include "i2-dyn.h"
 
 using namespace icinga;