From: Francis Dupont <fdupont@isc.org>
Date: Fri, 6 Nov 2015 03:00:23 +0000 (+0100)
Subject: [4088fd] Renamed file to file_
X-Git-Tag: trac4088fd_cpp~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f18bc3cdb108f189c08272d90773ad8d467b0187;p=thirdparty%2Fkea.git

[4088fd] Renamed file to file_
---

diff --git a/src/lib/eval/eval_context.cc b/src/lib/eval/eval_context.cc
index 86f90bda83..a22e18c72d 100644
--- a/src/lib/eval/eval_context.cc
+++ b/src/lib/eval/eval_context.cc
@@ -29,7 +29,7 @@ EvalContext::~EvalContext()
 int
 EvalContext::parseFile(const std::string &filename)
 {
-    file = filename;
+    file_ = filename;
     scanBegin();
     isc::eval::EvalParser parser(*this);
     parser.set_debug_level(trace_parsing_);
diff --git a/src/lib/eval/eval_context.h b/src/lib/eval/eval_context.h
index 80ba4c76fe..401c46b13b 100644
--- a/src/lib/eval/eval_context.h
+++ b/src/lib/eval/eval_context.h
@@ -69,7 +69,7 @@ public:
 
     /// @brief The name of the file being parsed.
     /// Used later to pass the file name to the location tracker.
-    std::string file;
+    std::string file_;
 
     /// @brief Error handler
     ///
diff --git a/src/lib/eval/lexer.cc b/src/lib/eval/lexer.cc
index 78117d26cc..6d976b7011 100644
--- a/src/lib/eval/lexer.cc
+++ b/src/lib/eval/lexer.cc
@@ -2237,11 +2237,11 @@ void
 EvalContext::scanBegin()
 {
     yy_flex_debug = trace_scanning_;
-    if (file.empty () || file == "-") {
+    if (file_.empty () || file_ == "-") {
         yyin = stdin;
     }
-    else if (!(yyin = fopen(file.c_str (), "r"))) {
-        error("cannot open " + file + ": " + strerror(errno));
+    else if (!(yyin = fopen(file_.c_str (), "r"))) {
+        error("cannot open " + file_ + ": " + strerror(errno));
         exit(EXIT_FAILURE);
     }
 }
diff --git a/src/lib/eval/lexer.ll b/src/lib/eval/lexer.ll
index 190cd89d54..1d86d9db90 100644
--- a/src/lib/eval/lexer.ll
+++ b/src/lib/eval/lexer.ll
@@ -149,11 +149,11 @@ void
 EvalContext::scanBegin()
 {
     yy_flex_debug = trace_scanning_;
-    if (file.empty () || file == "-") {
+    if (file_.empty () || file_ == "-") {
         yyin = stdin;
     }
-    else if (!(yyin = fopen(file.c_str (), "r"))) {
-        error("cannot open " + file + ": " + strerror(errno));
+    else if (!(yyin = fopen(file_.c_str (), "r"))) {
+        error("cannot open " + file_ + ": " + strerror(errno));
         exit(EXIT_FAILURE);
     }
 }
diff --git a/src/lib/eval/parser.cc b/src/lib/eval/parser.cc
index 1f5066914d..19aa6da251 100644
--- a/src/lib/eval/parser.cc
+++ b/src/lib/eval/parser.cc
@@ -454,7 +454,7 @@ namespace isc { namespace eval {
     #line 36 "parser.yy" // lalr1.cc:745
 {
   // Initialize the initial location.
-  yyla.location.begin.filename = yyla.location.end.filename = &ctx.file;
+  yyla.location.begin.filename = yyla.location.end.filename = &ctx.file_;
 }
 
 #line 461 "parser.cc" // lalr1.cc:745
diff --git a/src/lib/eval/parser.yy b/src/lib/eval/parser.yy
index fa7a317d8a..edad29c1c5 100644
--- a/src/lib/eval/parser.yy
+++ b/src/lib/eval/parser.yy
@@ -35,7 +35,7 @@ using namespace isc::eval;
 %initial-action
 {
   // Initialize the initial location.
-  @$.begin.filename = @$.end.filename = &ctx.file;
+  @$.begin.filename = @$.end.filename = &ctx.file_;
 };
 %define parse.trace
 %define parse.error verbose