More simplify

Author: ajreynol

src/expr_parser.cpp

@@ -463,15 +463,9 @@ Expr ExprParser::parseExpr()
         {
           // now parse attribute list
           AttrMap attrs;
-          bool pushedScope = false;
           // NOTE parsing attributes may trigger recursive calls to this
           // method.
-          parseAttributeList(Kind::NONE, ret, attrs, pushedScope);
-          // the scope of the variable is one level up
-          if (pushedScope && pstack.size()>1)
-          {
-            pstack[pstack.size()-2].d_nscopes++;
-          }
+          parseAttributeList(Kind::NONE, ret, attrs);
           // process the attributes
           for (std::pair<const Attr, std::vector<Expr>>& a : attrs)
           {
@@ -1098,7 +1092,7 @@ std::string ExprParser::parseStr(bool unescape)
 }
 
 void ExprParser::parseAttributeList(
-    Kind k, Expr& e, AttrMap& attrs, bool& pushedScope, Kind plk)
+    Kind k, Expr& e, AttrMap& attrs, Kind plk)
 {
   std::map<std::string, Attr>::iterator its;
   // while the next token is KEYWORD, exit if RPAREN
@@ -1237,17 +1231,6 @@ void ExprParser::parseAttributeList(
   d_lex.reinsertToken(Token::RPAREN);
 }
 
-void ExprParser::parseAttributeList(Kind k, Expr& e, AttrMap& attrs, Kind plk)
-{
-  bool pushedScope = false;
-  parseAttributeList(k, e, attrs, pushedScope, plk);
-  // pop the scope if necessary
-  if (pushedScope)
-  {
-    d_state.popScope();
-  }
-}
-
 Kind ExprParser::parseLiteralKind()
 {
   std::string name = parseSymbol();

src/expr_parser.h

@@ -128,18 +128,9 @@ class ExprParser
    * - NONE otherwise.
    * @param e The expression we are applying to
    * @param attr The attributes which are populated
-   * @param pushedScope True if we pushed a scope while reading the list. This
-   * is true when e.g. the attribute :var is read. The caller of this method
-   * is responsible for popping the scope.
    * @param plk If k is PARAM, this is the category of the parameter list
    * which that parameter belongs to
    */
-  void parseAttributeList(Kind k,
-                          Expr& e,
-                          AttrMap& attrs,
-                          bool& pushedScope,
-                          Kind plk = Kind::NONE);
-  /** Same as above, but ensures we pop the scope */
   void parseAttributeList(Kind k,
                           Expr& e,
                           AttrMap& attrs,