Merge pull request #2443 from tautschnig/vs-rdecl

Remove unused parameter from rDeclarator

Author: Daniel Kroening

src/cpp/parse.cpp

@@ -283,7 +283,7 @@ class Parser // NOLINT(readability/identifiers)
 
   bool rDeclarators(cpp_declarationt::declaratorst &, bool, bool=false);
   bool rDeclaratorWithInit(cpp_declaratort &, bool, bool);
-  bool rDeclarator(cpp_declaratort &, DeclKind, bool, bool, bool=false);
+  bool rDeclarator(cpp_declaratort &, DeclKind, bool, bool);
   bool rDeclaratorQualifier();
   bool optPtrOperator(typet &);
   bool rMemberInitializers(irept &);
@@ -1293,7 +1293,7 @@ bool Parser::rTempArgDeclaration(cpp_declarationt &declaration)
     declaration.declarators().resize(1);
     cpp_declaratort &declarator=declaration.declarators().front();
 
-    if(!rDeclarator(declarator, kArgDeclarator, false, true))
+    if(!rDeclarator(declarator, kArgDeclarator, true, false))
       return false;
 
     #ifdef DEBUG
@@ -1507,7 +1507,7 @@ bool Parser::rSimpleDeclaration(cpp_declarationt &declaration)
   declaration.type().swap(integral);
 
   cpp_declaratort declarator;
-  if(!rDeclarator(declarator, kDeclarator, false, true, true))
+  if(!rDeclarator(declarator, kDeclarator, true, true))
     return false;
 
   // there really _has_ to be an initializer!
@@ -2876,8 +2876,8 @@ bool Parser::rDeclaratorWithInit(
   {
     cpp_declaratort declarator;
 
-    if(!rDeclarator(declarator, kDeclarator, false,
-                    should_be_declarator, is_statement))
+    if(!rDeclarator(
+        declarator, kDeclarator, should_be_declarator, is_statement))
       return false;
 
     int t=lex.LookAhead(0);
@@ -2993,7 +2993,6 @@ bool Parser::rDeclaratorQualifier()
 bool Parser::rDeclarator(
   cpp_declaratort &declarator,
   DeclKind kind,
-  bool recursive,
   bool should_be_declarator,
   bool is_statement)
 {
@@ -3038,7 +3037,7 @@ bool Parser::rDeclarator(
     lex.get_token(op);
 
     cpp_declaratort declarator2;
-    if(!rDeclarator(declarator2, kind, true, true, false))
+    if(!rDeclarator(declarator2, kind, true, false))
       return false;
 
     #ifdef DEBUG
@@ -4122,7 +4121,7 @@ bool Parser::rArgDeclaration(cpp_declarationt &declaration)
 
   cpp_declaratort arg_declarator;
 
-  if(!rDeclarator(arg_declarator, kArgDeclarator, false, true))
+  if(!rDeclarator(arg_declarator, kArgDeclarator, true, false))
     return false;
 
   declaration.declarators().push_back(arg_declarator);