Do not shadow "args"

cmdlinet has a member "args". Rename the parameter to avoid shadowing.

Author: tautschnig

src/goto-cc/gcc_cmdline.cpp

@@ -221,25 +221,25 @@ bool gcc_cmdlinet::parse(int argc, const char **argv)
   assert(argc>0);
   add_arg(argv[0]);
 
-  argst args;
-  args.reserve(argc-1);
+  argst current_args;
+  current_args.reserve(argc - 1);
 
   for(int i=1; i<argc; i++)
-    args.push_back(argv[i]);
+    current_args.push_back(argv[i]);
 
-  bool result=parse_arguments(args, false);
+  bool result = parse_arguments(current_args, false);
 
   parse_specs();
 
   return result;
 }
 
 bool gcc_cmdlinet::parse_arguments(
-  const argst &args,
+  const argst &args_to_parse,
   bool in_spec_file)
 {
-  for(argst::const_iterator it=args.begin();
-      it!=args.end();
+  for(argst::const_iterator it = args_to_parse.begin();
+      it != args_to_parse.end();
       ++it)
   {
     const std::string &argv_i=*it;
@@ -292,7 +292,7 @@ bool gcc_cmdlinet::parse_arguments(
         if(argv_i==*o) // separated
         {
           found=true;
-          if(next!=args.end())
+          if(next != args_to_parse.end())
           {
             set(argv_i, *next);
             ++it;
@@ -364,7 +364,7 @@ bool gcc_cmdlinet::parse_arguments(
         if(argv_i==*o) // separated
         {
           found=true;
-          if(next!=args.end())
+          if(next != args_to_parse.end())
           {
             set(argv_i, *next);
             if(!in_spec_file)
@@ -390,7 +390,7 @@ bool gcc_cmdlinet::parse_arguments(
         if(argv_i==*o) // separated
         {
           found=true;
-          if(next!=args.end())
+          if(next != args_to_parse.end())
           {
             set(argv_i, *next);
             if(!in_spec_file)
@@ -438,17 +438,17 @@ void gcc_cmdlinet::parse_specs_line(const std::string &line, bool in_spec_file)
   assert(!line.empty());
   assert(line[0]!=' ' && line[0]!='\t');
 
-  argst args;
+  argst args_from_specs;
 
   for(std::string::size_type arg_start=0, arg_end=0;
       arg_end!=std::string::npos;
       arg_start=line.find_first_not_of("\t ", arg_end))
   {
     arg_end=line.find_first_of("\t ", arg_start);
-    args.push_back(line.substr(arg_start, arg_end-arg_start));
+    args_from_specs.push_back(line.substr(arg_start, arg_end - arg_start));
   }
 
-  parse_arguments(args, in_spec_file);
+  parse_arguments(args_from_specs, in_spec_file);
 }
 
 /// Parse GCC spec files https://gcc.gnu.org/onlinedocs/gcc/Spec-Files.html

src/goto-cc/gcc_cmdline.h

@@ -29,7 +29,7 @@ class gcc_cmdlinet:public goto_cc_cmdlinet
 protected:
   typedef std::vector<std::string> argst;
 
-  bool parse_arguments(const argst &args, bool in_spec_file);
+  bool parse_arguments(const argst &args_to_parse, bool in_spec_file);
   void parse_specs();
   void parse_specs_line(const std::string &line, bool in_spec_file);
 };