Harness option parser is a namespace

not a class: its methods are not static and we do not inherit from it.

Also change the linter script to allow namespaces in the first place.

Author: petr-bauch

scripts/cpplint.py

@@ -2479,26 +2479,26 @@ def CheckEnd(self, filename, clean_lines, linenum, error):
     # Besides these, we don't accept anything else, otherwise we might
     # get false negatives when existing comment is a substring of the
     # expected namespace.
-#    if self.name:
-#      # Named namespace
-#      if not Match((r'^\s*};*\s*(//|/\*).*\bnamespace\s+' +
-#                    re.escape(self.name) + r'[\*/\.\\\s]*$'),
-#                   line):
-#        error(filename, linenum, 'readability/namespace', 5,
-#              'Namespace should be terminated with "// namespace %s"' %
-#              self.name)
-#    else:
-#      # Anonymous namespace
-#      if not Match(r'^\s*};*\s*(//|/\*).*\bnamespace[\*/\.\\\s]*$', line):
-#        # If "// namespace anonymous" or "// anonymous namespace (more text)",
-#        # mention "// anonymous namespace" as an acceptable form
-#        if Match(r'^\s*}.*\b(namespace anonymous|anonymous namespace)\b', line):
-#          error(filename, linenum, 'readability/namespace', 5,
-#                'Anonymous namespace should be terminated with "// namespace"'
-#                ' or "// anonymous namespace"')
-#        else:
-#          error(filename, linenum, 'readability/namespace', 5,
-#                'Anonymous namespace should be terminated with "// namespace"')
+    if self.name:
+      # Named namespace
+     if not Match((r'^\s*};*\s*(//|/\*).*\bnamespace\s+' +
+                   re.escape(self.name) + r'[\*/\.\\\s]*$'),
+                  line):
+       error(filename, linenum, 'readability/namespace', 5,
+             'Namespace should be terminated with "// namespace %s"' %
+             self.name)
+    else:
+      # Anonymous namespace
+      if not Match(r'^\s*};*\s*(//|/\*).*\bnamespace[\*/\.\\\s]*$', line):
+        # If "// namespace anonymous" or "// anonymous namespace (more text)",
+        # mention "// anonymous namespace" as an acceptable form
+        if Match(r'^\s*}.*\b(namespace anonymous|anonymous namespace)\b', line):
+          error(filename, linenum, 'readability/namespace', 5,
+                'Anonymous namespace should be terminated with "// namespace"'
+                ' or "// anonymous namespace"')
+        else:
+          error(filename, linenum, 'readability/namespace', 5,
+                'Anonymous namespace should be terminated with "// namespace"')
 
 
 class _PreprocessorInfo(object):
@@ -6296,25 +6296,6 @@ def CheckItemIndentationInNamespace(filename, raw_lines_no_comments, linenum,
     error(filename, linenum, 'runtime/indentation_namespace', 4,
           'Do not indent within a namespace')
 
-def CheckNamespaceOrUsing(filename, clean_lines, linenum, error):
-  line = clean_lines.elided[linenum]
-  if Match(r'^\s*namespace(\s+.*)?$', line):
-    num_lines=len(clean_lines.elided)
-    current_linenum=linenum
-    while current_linenum<num_lines:
-      current_line=clean_lines.elided[current_linenum]
-      if current_linenum==linenum:
-        is_named=Match(r'^\s*namespace\s+[^\s{]+.*$', current_line)
-      else:
-        is_named=Match(r'^\s*[^\s{]+.*$', current_line)
-      if is_named:
-        error(filename, linenum, 'readability/namespace', 4,
-              'Do not use namespaces')
-        break
-      if '{' in current_line:
-        break
-      current_linenum+=1
-
 def CheckForEndl(filename, clean_lines, linenum, error):
   """Check that the line does not contain std::endl."""
   line = clean_lines.elided[linenum]
@@ -6362,7 +6343,6 @@ def ProcessLine(filename, file_extension, clean_lines, line,
   CheckMakePairUsesDeduction(filename, clean_lines, line, error)
   CheckRedundantVirtual(filename, clean_lines, line, error)
   CheckCatchTestHasTags(filename, clean_lines, line, error)
-  CheckNamespaceOrUsing(filename, clean_lines, line, error)
   CheckForEndl(filename, clean_lines, line, error)
   for check_fn in extra_check_functions:
     check_fn(filename, clean_lines, line, error)

src/goto-harness/function_call_harness_generator.cpp

@@ -91,7 +91,7 @@ void function_call_harness_generatort::handle_option(
   const std::list<std::string> &values)
 {
   auto &require_exactly_one_value =
-    harness_options_parsert::require_exactly_one_value;
+    harness_options_parser::require_exactly_one_value;
 
   if(p_impl->recursive_initialization_config.handle_option(option, values))
   {

src/goto-harness/goto_harness_generator.cpp

@@ -15,7 +15,9 @@ Author: Diffblue Ltd.
 #include <util/invariant.h>
 #include <util/string2int.h>
 
-std::string harness_options_parsert::require_exactly_one_value(
+namespace harness_options_parser
+{
+std::string require_exactly_one_value(
   const std::string &option,
   const std::list<std::string> &values)
 {
@@ -28,14 +30,14 @@ std::string harness_options_parsert::require_exactly_one_value(
   return values.front();
 }
 
-void harness_options_parsert::assert_no_values(
+void assert_no_values(
   const std::string &option,
   const std::list<std::string> &values)
 {
   PRECONDITION_WITH_DIAGNOSTICS(values.empty(), option);
 }
 
-std::size_t harness_options_parsert::require_one_size_value(
+std::size_t require_one_size_value(
   const std::string &option,
   const std::list<std::string> &values)
 {
@@ -51,3 +53,4 @@ std::size_t harness_options_parsert::require_one_size_value(
       "failed to parse `" + string_value + "' as integer", "--" + option};
   }
 }
+} // namespace harness_options_parser

src/goto-harness/goto_harness_generator.h

@@ -16,26 +16,25 @@ Author: Diffblue Ltd.
 
 class goto_modelt;
 
-class harness_options_parsert
+namespace harness_options_parser
 {
-public:
-  /// Returns the only value of a single element list,
-  /// throws an exception if not passed a single element list
-  static std::string require_exactly_one_value(
-    const std::string &option,
-    const std::list<std::string> &values);
-
-  /// Asserts that the list of values to an option passed is empty
-  static void assert_no_values(
-    const std::string &option,
-    const std::list<std::string> &values);
-
-  /// Returns the only Nat value of a single element list,
-  /// throws an exception if not passed a single element list (or not Nat)
-  static std::size_t require_one_size_value(
-    const std::string &option,
-    const std::list<std::string> &values);
-};
+/// Returns the only value of a single element list,
+/// throws an exception if not passed a single element list
+std::string require_exactly_one_value(
+  const std::string &option,
+  const std::list<std::string> &values);
+
+/// Asserts that the list of values to an option passed is empty
+void assert_no_values(
+  const std::string &option,
+  const std::list<std::string> &values);
+
+/// Returns the only Nat value of a single element list,
+/// throws an exception if not passed a single element list (or not Nat)
+std::size_t require_one_size_value(
+  const std::string &option,
+  const std::list<std::string> &values);
+} // namespace harness_options_parser
 
 class goto_harness_generatort
 {

src/goto-harness/memory_snapshot_harness_generator.cpp

@@ -33,7 +33,7 @@ void memory_snapshot_harness_generatort::handle_option(
   const std::list<std::string> &values)
 {
   auto &require_exactly_one_value =
-    harness_options_parsert::require_exactly_one_value;
+    harness_options_parser::require_exactly_one_value;
   if(recursive_initialization_config.handle_option(option, values))
   {
     // the option belongs to recursive initialization

src/goto-harness/recursive_initialization.cpp

@@ -26,7 +26,8 @@ bool recursive_initialization_configt::handle_option(
 {
   if(option == COMMON_HARNESS_GENERATOR_MIN_NULL_TREE_DEPTH_OPT)
   {
-    auto const value = require_exactly_one_value(option, values);
+    auto const value =
+      harness_options_parser::require_exactly_one_value(option, values);
     auto const user_min_null_tree_depth =
       string2optional<std::size_t>(value, 10);
     if(user_min_null_tree_depth.has_value())
@@ -43,7 +44,8 @@ bool recursive_initialization_configt::handle_option(
   }
   else if(option == COMMON_HARNESS_GENERATOR_MAX_NONDET_TREE_DEPTH_OPT)
   {
-    auto const value = require_exactly_one_value(option, values);
+    auto const value =
+      harness_options_parser::require_exactly_one_value(option, values);
     auto const user_max_nondet_tree_depth =
       string2optional<std::size_t>(value, 10);
     if(user_max_nondet_tree_depth.has_value())
@@ -60,13 +62,13 @@ bool recursive_initialization_configt::handle_option(
   }
   else if(option == COMMON_HARNESS_GENERATOR_MAX_ARRAY_SIZE_OPT)
   {
-    max_dynamic_array_size = require_one_size_value(
+    max_dynamic_array_size = harness_options_parser::require_one_size_value(
       COMMON_HARNESS_GENERATOR_MAX_ARRAY_SIZE_OPT, values);
     return true;
   }
   else if(option == COMMON_HARNESS_GENERATOR_MIN_ARRAY_SIZE_OPT)
   {
-    min_dynamic_array_size = require_one_size_value(
+    min_dynamic_array_size = harness_options_parser::require_one_size_value(
       COMMON_HARNESS_GENERATOR_MIN_ARRAY_SIZE_OPT, values);
     return true;
   }

src/goto-harness/recursive_initialization.h

@@ -21,7 +21,7 @@ Author: Diffblue Ltd.
 #include "function_harness_generator_options.h"
 #include "goto_harness_generator.h"
 
-struct recursive_initialization_configt : harness_options_parsert
+struct recursive_initialization_configt
 {
   std::size_t min_null_tree_depth = 1;
   std::size_t max_nondet_tree_depth = 2;