Rename parameters and local variables "options" to "arguments"

tautschnig · tautschnig · commit 2b27328ae7d4 · 2019-01-04T12:32:05.000Z
This avoids shadowing the class member "options", which is also used in that
file.
diff --git a/src/goto-cc/ms_cl_cmdline.cpp b/src/goto-cc/ms_cl_cmdline.cpp
@@ -47,48 +47,46 @@ const char *non_ms_cl_options[]=
   nullptr
 };
 
-bool ms_cl_cmdlinet::parse(const std::vector<std::string> &options)
+bool ms_cl_cmdlinet::parse(const std::vector<std::string> &arguments)
 {
-  for(std::size_t i=0; i<options.size(); i++)
+  for(std::size_t i = 0; i < arguments.size(); i++)
   {
     // is it a non-cl option?
-    if(std::string(options[i], 0, 2)=="--")
+    if(std::string(arguments[i], 0, 2) == "--")
     {
-      process_non_cl_option(options[i]);
+      process_non_cl_option(arguments[i]);
 
-      if(options[i]=="--verbosity" ||
-         options[i]=="--function")
+      if(arguments[i] == "--verbosity" || arguments[i] == "--function")
       {
-        if(i<options.size()-1)
+        if(i < arguments.size() - 1)
         {
-          set(options[i], options[i+1]);
+          set(arguments[i], arguments[i + 1]);
           i++; // skip ahead
         }
       }
     }
-    else if(!options[i].empty() && options[i][0]=='@')
+    else if(!arguments[i].empty() && arguments[i][0] == '@')
     {
       // potentially recursive
-      process_response_file(
-        std::string(options[i], 1, std::string::npos));
+      process_response_file(std::string(arguments[i], 1, std::string::npos));
     }
-    else if(options[i]=="/link" ||
-            options[i]=="-link")
+    else if(arguments[i] == "/link" || arguments[i] == "-link")
     {
       // anything that follows goes to the linker
-      i=options.size()-1;
+      i = arguments.size() - 1;
     }
-    else if(options[i].size()==2 &&
-            (options[i]=="/D" || options[i]=="-D") &&
-            i!=options.size()-1)
+    else if(
+      arguments[i].size() == 2 &&
+      (arguments[i] == "/D" || arguments[i] == "-D") &&
+      i != arguments.size() - 1)
     {
       // this requires special treatment, as you can do "/D something"
-      std::string tmp="/D"+options[i+1];
+      std::string tmp = "/D" + arguments[i + 1];
       i++;
       process_cl_option(tmp);
     }
     else
-      process_cl_option(options[i]);
+      process_cl_option(arguments[i]);
   }
 
   return false;
@@ -123,13 +121,13 @@ bool ms_cl_cmdlinet::parse(int argc, const char **argv)
 {
   // should really use "wide" argv from wmain()
 
-  std::vector<std::string> options;
+  std::vector<std::string> arguments;
 
   // skip argv[0]
   for(int i=1; i<argc; i++)
-    options.push_back(argv[i]);
+    arguments.push_back(argv[i]);
 
-  return parse(options);
+  return parse(arguments);
 }
 
 static std::istream &my_wgetline(std::istream &in, std::wstring &dest)
@@ -242,7 +240,7 @@ void ms_cl_cmdlinet::process_response_file_line(const std::string &line)
   if(line[0]=='#')
     return; // comment
 
-  std::vector<std::string> options;
+  std::vector<std::string> arguments;
   std::string option;
   bool in_quotes=false;
   for(std::size_t i=0; i<line.size(); i++)
@@ -252,7 +250,7 @@ void ms_cl_cmdlinet::process_response_file_line(const std::string &line)
     if(ch==' ' && !in_quotes)
     {
       if(!option.empty())
-        options.push_back(option);
+        arguments.push_back(option);
       option.clear();
     }
     else if(ch=='"')
@@ -264,9 +262,9 @@ void ms_cl_cmdlinet::process_response_file_line(const std::string &line)
   }
 
   if(!option.empty())
-    options.push_back(option);
+    arguments.push_back(option);
 
-  parse(options);
+  parse(arguments);
 }
 
 /// \return none
diff --git a/src/goto-cc/ms_link_cmdline.cpp b/src/goto-cc/ms_link_cmdline.cpp
@@ -28,31 +28,31 @@ const char *non_ms_link_options[]=
   "--verbosity"
 };
 
-bool ms_link_cmdlinet::parse(const std::vector<std::string> &options)
+bool ms_link_cmdlinet::parse(const std::vector<std::string> &arguments)
 {
-  for(std::size_t i = 0; i < options.size(); i++)
+  for(std::size_t i = 0; i < arguments.size(); i++)
   {
     // is it a non-link option?
-    if(std::string(options[i], 0, 2) == "--")
+    if(std::string(arguments[i], 0, 2) == "--")
     {
-      process_non_link_option(options[i]);
+      process_non_link_option(arguments[i]);
 
-      if(options[i] == "--verbosity")
+      if(arguments[i] == "--verbosity")
       {
-        if(i < options.size() - 1)
+        if(i < arguments.size() - 1)
         {
-          set(options[i], options[i + 1]);
+          set(arguments[i], arguments[i + 1]);
           i++; // skip ahead
         }
       }
     }
-    else if(!options[i].empty() && options[i][0] == '@')
+    else if(!arguments[i].empty() && arguments[i][0] == '@')
     {
       // potentially recursive
-      process_response_file(std::string(options[i], 1, std::string::npos));
+      process_response_file(std::string(arguments[i], 1, std::string::npos));
     }
     else
-      process_link_option(options[i]);
+      process_link_option(arguments[i]);
   }
 
   return false;
@@ -65,13 +65,13 @@ bool ms_link_cmdlinet::parse(int argc, const char **argv)
 {
   // should really use "wide" argv from wmain()
 
-  std::vector<std::string> options;
+  std::vector<std::string> arguments;
 
   // skip argv[0]
   for(int i = 1; i < argc; i++)
-    options.push_back(argv[i]);
+    arguments.push_back(argv[i]);
 
-  return parse(options);
+  return parse(arguments);
 }
 
 static std::istream &my_wgetline(std::istream &in, std::wstring &dest)
@@ -182,7 +182,7 @@ void ms_link_cmdlinet::process_response_file_line(const std::string &line)
   if(line[0] == '#')
     return; // comment
 
-  std::vector<std::string> options;
+  std::vector<std::string> arguments;
   std::string option;
   bool in_quotes = false;
   for(std::size_t i = 0; i < line.size(); i++)
@@ -192,7 +192,7 @@ void ms_link_cmdlinet::process_response_file_line(const std::string &line)
     if(ch == ' ' && !in_quotes)
     {
       if(!option.empty())
-        options.push_back(option);
+        arguments.push_back(option);
       option.clear();
     }
     else if(ch == '"')
@@ -204,9 +204,9 @@ void ms_link_cmdlinet::process_response_file_line(const std::string &line)
   }
 
   if(!option.empty())
-    options.push_back(option);
+    arguments.push_back(option);
 
-  parse(options);
+  parse(arguments);
 }
 
 /// \return none

Original file line number	Diff line number	Diff line change
`@@ -47,48 +47,46 @@ const char *non_ms_cl_options[]=`
`47`	`47`	`nullptr`
`48`	`48`	`};`
`49`	`49`
`50`		`-bool ms_cl_cmdlinet::parse(const std::vector<std::string> &options)`
	`50`	`+bool ms_cl_cmdlinet::parse(const std::vector<std::string> &arguments)`
`51`	`51`	`{`
`52`		`- for(std::size_t i=0; i<options.size(); i++)`
	`52`	`+ for(std::size_t i = 0; i < arguments.size(); i++)`
`53`	`53`	`{`
`54`	`54`	`// is it a non-cl option?`
`55`		`- if(std::string(options[i], 0, 2)=="--")`
	`55`	`+ if(std::string(arguments[i], 0, 2) == "--")`
`56`	`56`	`{`
`57`		`- process_non_cl_option(options[i]);`
	`57`	`+ process_non_cl_option(arguments[i]);`
`58`	`58`
`59`		`- if(options[i]=="--verbosity" \|\|`
`60`		`- options[i]=="--function")`
	`59`	`+ if(arguments[i] == "--verbosity" \|\| arguments[i] == "--function")`
`61`	`60`	`{`
`62`		`- if(i<options.size()-1)`
	`61`	`+ if(i < arguments.size() - 1)`
`63`	`62`	`{`
`64`		`- set(options[i], options[i+1]);`
	`63`	`+ set(arguments[i], arguments[i + 1]);`
`65`	`64`	`i++; // skip ahead`
`66`	`65`	`}`
`67`	`66`	`}`
`68`	`67`	`}`
`69`		`- else if(!options[i].empty() && options[i][0]=='@')`
	`68`	`+ else if(!arguments[i].empty() && arguments[i][0] == '@')`
`70`	`69`	`{`
`71`	`70`	`// potentially recursive`
`72`		`- process_response_file(`
`73`		`- std::string(options[i], 1, std::string::npos));`
	`71`	`+ process_response_file(std::string(arguments[i], 1, std::string::npos));`
`74`	`72`	`}`
`75`		`- else if(options[i]=="/link" \|\|`
`76`		`- options[i]=="-link")`
	`73`	`+ else if(arguments[i] == "/link" \|\| arguments[i] == "-link")`
`77`	`74`	`{`
`78`	`75`	`// anything that follows goes to the linker`
`79`		`- i=options.size()-1;`
	`76`	`+ i = arguments.size() - 1;`
`80`	`77`	`}`
`81`		`- else if(options[i].size()==2 &&`
`82`		`- (options[i]=="/D" \|\| options[i]=="-D") &&`
`83`		`- i!=options.size()-1)`
	`78`	`+ else if(`
	`79`	`+ arguments[i].size() == 2 &&`
	`80`	`+ (arguments[i] == "/D" \|\| arguments[i] == "-D") &&`
	`81`	`+ i != arguments.size() - 1)`
`84`	`82`	`{`
`85`	`83`	`// this requires special treatment, as you can do "/D something"`
`86`		`- std::string tmp="/D"+options[i+1];`
	`84`	`+ std::string tmp = "/D" + arguments[i + 1];`
`87`	`85`	`i++;`
`88`	`86`	`process_cl_option(tmp);`
`89`	`87`	`}`
`90`	`88`	`else`
`91`		`- process_cl_option(options[i]);`
	`89`	`+ process_cl_option(arguments[i]);`
`92`	`90`	`}`
`93`	`91`
`94`	`92`	`return false;`
`@@ -123,13 +121,13 @@ bool ms_cl_cmdlinet::parse(int argc, const char **argv)`
`123`	`121`	`{`
`124`	`122`	`// should really use "wide" argv from wmain()`
`125`	`123`
`126`		`- std::vector<std::string> options;`
	`124`	`+ std::vector<std::string> arguments;`
`127`	`125`
`128`	`126`	`// skip argv[0]`
`129`	`127`	`for(int i=1; i<argc; i++)`
`130`		`- options.push_back(argv[i]);`
	`128`	`+ arguments.push_back(argv[i]);`
`131`	`129`
`132`		`- return parse(options);`
	`130`	`+ return parse(arguments);`
`133`	`131`	`}`
`134`	`132`
`135`	`133`	`static std::istream &my_wgetline(std::istream &in, std::wstring &dest)`
`@@ -242,7 +240,7 @@ void ms_cl_cmdlinet::process_response_file_line(const std::string &line)`
`242`	`240`	`if(line[0]=='#')`
`243`	`241`	`return; // comment`
`244`	`242`
`245`		`- std::vector<std::string> options;`
	`243`	`+ std::vector<std::string> arguments;`
`246`	`244`	`std::string option;`
`247`	`245`	`bool in_quotes=false;`
`248`	`246`	`for(std::size_t i=0; i<line.size(); i++)`
`@@ -252,7 +250,7 @@ void ms_cl_cmdlinet::process_response_file_line(const std::string &line)`
`252`	`250`	`if(ch==' ' && !in_quotes)`
`253`	`251`	`{`
`254`	`252`	`if(!option.empty())`
`255`		`- options.push_back(option);`
	`253`	`+ arguments.push_back(option);`
`256`	`254`	`option.clear();`
`257`	`255`	`}`
`258`	`256`	`else if(ch=='"')`
`@@ -264,9 +262,9 @@ void ms_cl_cmdlinet::process_response_file_line(const std::string &line)`
`264`	`262`	`}`
`265`	`263`
`266`	`264`	`if(!option.empty())`
`267`		`- options.push_back(option);`
	`265`	`+ arguments.push_back(option);`
`268`	`266`
`269`		`- parse(options);`
	`267`	`+ parse(arguments);`
`270`	`268`	`}`
`271`	`269`
`272`	`270`	`/// \return none`
Original file line number	Diff line number	Diff line change
`@@ -28,31 +28,31 @@ const char *non_ms_link_options[]=`
`28`	`28`	`"--verbosity"`
`29`	`29`	`};`
`30`	`30`
`31`		`-bool ms_link_cmdlinet::parse(const std::vector<std::string> &options)`
	`31`	`+bool ms_link_cmdlinet::parse(const std::vector<std::string> &arguments)`
`32`	`32`	`{`
`33`		`- for(std::size_t i = 0; i < options.size(); i++)`
	`33`	`+ for(std::size_t i = 0; i < arguments.size(); i++)`
`34`	`34`	`{`
`35`	`35`	`// is it a non-link option?`
`36`		`- if(std::string(options[i], 0, 2) == "--")`
	`36`	`+ if(std::string(arguments[i], 0, 2) == "--")`
`37`	`37`	`{`
`38`		`- process_non_link_option(options[i]);`
	`38`	`+ process_non_link_option(arguments[i]);`
`39`	`39`
`40`		`- if(options[i] == "--verbosity")`
	`40`	`+ if(arguments[i] == "--verbosity")`
`41`	`41`	`{`
`42`		`- if(i < options.size() - 1)`
	`42`	`+ if(i < arguments.size() - 1)`
`43`	`43`	`{`
`44`		`- set(options[i], options[i + 1]);`
	`44`	`+ set(arguments[i], arguments[i + 1]);`
`45`	`45`	`i++; // skip ahead`
`46`	`46`	`}`
`47`	`47`	`}`
`48`	`48`	`}`
`49`		`- else if(!options[i].empty() && options[i][0] == '@')`
	`49`	`+ else if(!arguments[i].empty() && arguments[i][0] == '@')`
`50`	`50`	`{`
`51`	`51`	`// potentially recursive`
`52`		`- process_response_file(std::string(options[i], 1, std::string::npos));`
	`52`	`+ process_response_file(std::string(arguments[i], 1, std::string::npos));`
`53`	`53`	`}`
`54`	`54`	`else`
`55`		`- process_link_option(options[i]);`
	`55`	`+ process_link_option(arguments[i]);`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`return false;`
`@@ -65,13 +65,13 @@ bool ms_link_cmdlinet::parse(int argc, const char **argv)`
`65`	`65`	`{`
`66`	`66`	`// should really use "wide" argv from wmain()`
`67`	`67`
`68`		`- std::vector<std::string> options;`
	`68`	`+ std::vector<std::string> arguments;`
`69`	`69`
`70`	`70`	`// skip argv[0]`
`71`	`71`	`for(int i = 1; i < argc; i++)`
`72`		`- options.push_back(argv[i]);`
	`72`	`+ arguments.push_back(argv[i]);`
`73`	`73`
`74`		`- return parse(options);`
	`74`	`+ return parse(arguments);`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`static std::istream &my_wgetline(std::istream &in, std::wstring &dest)`
`@@ -182,7 +182,7 @@ void ms_link_cmdlinet::process_response_file_line(const std::string &line)`
`182`	`182`	`if(line[0] == '#')`
`183`	`183`	`return; // comment`
`184`	`184`
`185`		`- std::vector<std::string> options;`
	`185`	`+ std::vector<std::string> arguments;`
`186`	`186`	`std::string option;`
`187`	`187`	`bool in_quotes = false;`
`188`	`188`	`for(std::size_t i = 0; i < line.size(); i++)`
`@@ -192,7 +192,7 @@ void ms_link_cmdlinet::process_response_file_line(const std::string &line)`
`192`	`192`	`if(ch == ' ' && !in_quotes)`
`193`	`193`	`{`
`194`	`194`	`if(!option.empty())`
`195`		`- options.push_back(option);`
	`195`	`+ arguments.push_back(option);`
`196`	`196`	`option.clear();`
`197`	`197`	`}`
`198`	`198`	`else if(ch == '"')`
`@@ -204,9 +204,9 @@ void ms_link_cmdlinet::process_response_file_line(const std::string &line)`
`204`	`204`	`}`
`205`	`205`
`206`	`206`	`if(!option.empty())`
`207`		`- options.push_back(option);`
	`207`	`+ arguments.push_back(option);`
`208`	`208`
`209`		`- parse(options);`
	`209`	`+ parse(arguments);`
`210`	`210`	`}`
`211`	`211`
`212`	`212`	`/// \return none`