[4088fd] Regenerated flex/bison

diff --git a/src/lib/eval/lexer.cc b/src/lib/eval/lexer.cc
index d6e796308622cc4812f5b1b513cacd9a277b8e14..ec483e94de2833b09d7af7eb848936e086e1ca01 100644 (file)
--- a/src/lib/eval/lexer.cc
+++ b/src/lib/eval/lexer.cc
@@ -2230,6 +2230,8 @@ void yyfree (void * ptr )
 
 
 
+using namespace isc::eval;
+
 void
 EvalContext::scanBegin()
 {

diff --git a/src/lib/eval/parser.cc b/src/lib/eval/parser.cc
index 3abd2be298ad502f3dbbec93339d36ef78d7f6e9..20cf623f57f9997062dba03c5512f9d9eb0f5ef9 100644 (file)
--- a/src/lib/eval/parser.cc
+++ b/src/lib/eval/parser.cc
@@ -49,7 +49,7 @@
 
 #line 51 "parser.cc" // lalr1.cc:412
 // Unqualified %code blocks.
-#line 42 "parser.yy" // lalr1.cc:413
+#line 43 "parser.yy" // lalr1.cc:413
 
 # include "eval_context.h"
 
@@ -320,14 +320,14 @@ namespace isc { namespace eval {
     {
             case 8: // "constant string"
 
-#line 56 "parser.yy" // lalr1.cc:636
+#line 57 "parser.yy" // lalr1.cc:636
         { yyoutput << yysym.value.template as< std::string > (); }
 #line 326 "parser.cc" // lalr1.cc:636
         break;
 
       case 9: // "option code"
 
-#line 56 "parser.yy" // lalr1.cc:636
+#line 57 "parser.yy" // lalr1.cc:636
         { yyoutput << yysym.value.template as< int > (); }
 #line 333 "parser.cc" // lalr1.cc:636
         break;
@@ -442,7 +442,7 @@ namespace isc { namespace eval {
 
 
     // User initialization code.
-    #line 35 "parser.yy" // lalr1.cc:745
+    #line 36 "parser.yy" // lalr1.cc:745
 {
   // Initialize the initial location.
   yyla.location.begin.filename = yyla.location.end.filename = &ctx.file;
@@ -564,7 +564,7 @@ namespace isc { namespace eval {
           switch (yyn)
             {
   case 2:
-#line 64 "parser.yy" // lalr1.cc:859
+#line 65 "parser.yy" // lalr1.cc:859
     {
     TokenPtr eq(new TokenEqual());
     ctx.expression.push_back(eq);
@@ -573,7 +573,7 @@ namespace isc { namespace eval {
     break;
 
   case 4:
-#line 71 "parser.yy" // lalr1.cc:859
+#line 72 "parser.yy" // lalr1.cc:859
     {
     TokenPtr str(new TokenString(yystack_[0].value.as< std::string > ()));
     ctx.expression.push_back(str);
@@ -582,7 +582,7 @@ namespace isc { namespace eval {
     break;
 
   case 5:
-#line 75 "parser.yy" // lalr1.cc:859
+#line 76 "parser.yy" // lalr1.cc:859
     {
     TokenPtr opt(new TokenOption(yystack_[0].value.as< int > ()));
     ctx.expression.push_back(opt);
@@ -591,7 +591,7 @@ namespace isc { namespace eval {
     break;
 
   case 6:
-#line 79 "parser.yy" // lalr1.cc:859
+#line 80 "parser.yy" // lalr1.cc:859
     {
     /* push back TokenSubstring */
   }
@@ -933,7 +933,7 @@ namespace isc { namespace eval {
   const unsigned char
   EvalParser::yyrline_[] =
   {
-       0,    64,    64,    68,    71,    75,    79
+       0,    65,    65,    69,    72,    76,    80
   };
 
   // Print the state stack on the debug stream.
@@ -969,7 +969,7 @@ namespace isc { namespace eval {
 #line 21 "parser.yy" // lalr1.cc:1167
 } } // isc::eval
 #line 972 "parser.cc" // lalr1.cc:1167
-#line 83 "parser.yy" // lalr1.cc:1168
+#line 84 "parser.yy" // lalr1.cc:1168
 
 void
 isc::eval::EvalParser::error(const location_type& l,

diff --git a/src/lib/eval/parser.h b/src/lib/eval/parser.h
index 114f426f51198590c4594151d839e64a11567f08..66f6c98001b15da1a2782cc5f449f107bfe36a12 100644 (file)
--- a/src/lib/eval/parser.h
+++ b/src/lib/eval/parser.h
@@ -44,11 +44,12 @@
 
 #include <string>
 #include <eval/token.h>
-class EvalContext;
+#include <eval/eval_context_decl.h>
 
 using namespace isc::dhcp;
+using namespace isc::eval;
 
-#line 52 "parser.h" // lalr1.cc:392
+#line 53 "parser.h" // lalr1.cc:392
 
 # include <cassert>
 # include <cstdlib> // std::abort
@@ -125,7 +126,7 @@ using namespace isc::dhcp;
 
 #line 21 "parser.yy" // lalr1.cc:392
 namespace isc { namespace eval {
-#line 129 "parser.h" // lalr1.cc:392
+#line 130 "parser.h" // lalr1.cc:392
 
 
 
@@ -993,7 +994,7 @@ namespace isc { namespace eval {
 
 #line 21 "parser.yy" // lalr1.cc:392
 } } // isc::eval
-#line 997 "parser.h" // lalr1.cc:392
+#line 998 "parser.h" // lalr1.cc:392