[#3502] Addressed comments

Author: fxdupont

src/lib/eval/eval_context.h

@@ -65,13 +65,13 @@ class EvalContext {
     static bool acceptAll(const ClientClass& client_class);
 
     /// @brief Parsed expression (output tokens are stored here)
-    isc::dhcp::Expression expression;
+    isc::dhcp::Expression expression_;
 
     /// @brief Label counter.
-    unsigned label;
+    unsigned label_;
 
     /// @brief Label stack.
-    std::vector<unsigned> labels;
+    std::vector<unsigned> labels_;
 
     /// @brief Method called before scanning starts on a string.
     ///

src/lib/eval/evaluate.h

@@ -20,7 +20,7 @@ namespace dhcp {
 /// @param expr   the RPN expression, i.e., a vector of parsed tokens
 /// @param pkt    The v4 or v6 packet
 /// @param values The stack of values
-/// @throw EvalBadLabel if there is a foreard branch to a not found target.
+/// @throw EvalBadLabel if there is a forward branch to a not found target.
 void evaluateRaw(const Expression& expr, Pkt& pkt, ValueStack& values);
 
 /// @brief Evaluate a RPN expression for a v4 or v6 packet and return
@@ -33,7 +33,7 @@ void evaluateRaw(const Expression& expr, Pkt& pkt, ValueStack& values);
 ///        stack at the end of the evaluation
 /// @throw EvalTypeError if the value at the top of the stack at the
 ///        end of the evaluation is not "false" or "true"
-/// @throw EvalBadLabel if there is a foreard branch to a not found target.
+/// @throw EvalBadLabel if there is a forward branch to a not found target.
 bool evaluateBool(const Expression& expr, Pkt& pkt);
 
 
@@ -47,7 +47,7 @@ bool evaluateBool(const Expression& expr, Pkt& pkt);
 ///        stack at the end of the evaluation
 /// @throw EvalTypeError if the value at the top of the stack at the
 ///        end of the evaluation is not "false" or "true"
-/// @throw EvalBadLabel if there is a foreard branch to a not found target.
+/// @throw EvalBadLabel if there is a forward branch to a not found target.
 std::string evaluateString(const Expression& expr, Pkt& pkt);
 
 }; // end of isc::dhcp namespace

src/lib/eval/lexer.cc

@@ -3012,7 +3012,7 @@ EvalContext::scanStringBegin(ParserType type)
     start_token_flag = true;
     start_token_value = type;
 
-    label = 0;
+    label_ = 0;
     loc.initialize(&file_);
     eval_flex_debug = trace_scanning_;
     YY_BUFFER_STATE buffer;

src/lib/eval/lexer.ll

@@ -257,7 +257,7 @@ EvalContext::scanStringBegin(ParserType type)
     start_token_flag = true;
     start_token_value = type;
 
-    label = 0;
+    label_ = 0;
     loc.initialize(&file_);
     eval_flex_debug = trace_scanning_;
     YY_BUFFER_STATE buffer;