[trac4269] Updates per review comments, basically change some variable names

diff --git a/src/lib/eval/parser.cc b/src/lib/eval/parser.cc
index 446fba2236da7072dc7853c83ea71470d5b1bf9e..009fe693481e3535c253fc0b6cd81d7d9031c58c 100644 (file)
--- a/src/lib/eval/parser.cc
+++ b/src/lib/eval/parser.cc
@@ -763,8 +763,8 @@ namespace isc { namespace eval {
   case 16:
 #line 182 "parser.yy" // lalr1.cc:859
     {
-                      TokenPtr pkt6field(new TokenPkt6(yystack_[0].value.as< TokenPkt6::FieldType > ()));
-                      ctx.expression.push_back(pkt6field);
+                      TokenPtr pkt6_field(new TokenPkt6(yystack_[0].value.as< TokenPkt6::FieldType > ()));
+                      ctx.expression.push_back(pkt6_field);
                   }
 #line 770 "parser.cc" // lalr1.cc:859
     break;

diff --git a/src/lib/eval/parser.yy b/src/lib/eval/parser.yy
index ac8a1334a57a948484ef9b651b5dc7ab268dbe77..67d190b6c0c806cb53c903d0aa8475ab576ed184 100644 (file)
--- a/src/lib/eval/parser.yy
+++ b/src/lib/eval/parser.yy
@@ -180,8 +180,8 @@ string_expr : STRING
                   }
             | PKT6 "." pkt6_field
                   {
-                      TokenPtr pkt6field(new TokenPkt6($3));
-                      ctx.expression.push_back(pkt6field);
+                      TokenPtr pkt6_field(new TokenPkt6($3));
+                      ctx.expression.push_back(pkt6_field);
                   }
             ;
 

diff --git a/src/lib/eval/tests/context_unittest.cc b/src/lib/eval/tests/context_unittest.cc
index 72c25adff4c0eb3eb012cebfa132245b8253a79c..e4ae0c3dcd28cbd3d2354b574dc6cf5af6637ff3 100644 (file)
--- a/src/lib/eval/tests/context_unittest.cc
+++ b/src/lib/eval/tests/context_unittest.cc
@@ -125,8 +125,9 @@ public:
 
     /// @brief checks if the given token is Pkt6 of specified type
     /// @param token token to be checked
-    /// @param type expected type of the Pkt6 field
-    void checkTokenPkt6(const TokenPtr& token, TokenPkt6::FieldType type) {
+    /// @param exp_type expected type of the Pkt6 field
+    void checkTokenPkt6(const TokenPtr& token,
+                        TokenPkt6::FieldType exp_type) {
         ASSERT_TRUE(token);
 
         boost::shared_ptr<TokenPkt6> pkt =
@@ -134,7 +135,7 @@ public:
 
         ASSERT_TRUE(pkt);
 
-        EXPECT_EQ(type, pkt->getType());
+        EXPECT_EQ(exp_type, pkt->getType());
     }
 
     /// @brief checks if the given expression raises the expected message