Give languaget a private typecheck method

This is to avoid breaking the API while introducing a new parameter,
symbols_to_keep. This parameter will be used in a later commit that will
prevent the typecheck method from stripping out user-requested symbols.

Author: karkhaz

jbmc/src/java_bytecode/java_bytecode_language.cpp

@@ -640,9 +640,10 @@ static void create_stub_global_symbols(
   }
 }
 
-bool java_bytecode_languaget::typecheck(
+bool java_bytecode_languaget::prv_typecheck(
   symbol_tablet &symbol_table,
-  const std::string &)
+  const std::string &module,
+  const std::set<std::string> &symbols_to_keep)
 {
   PRECONDITION(language_options_initialized);
 

jbmc/src/java_bytecode/java_bytecode_language.h

@@ -102,9 +102,10 @@ class java_bytecode_languaget:public languaget
   bool generate_support_functions(
     symbol_tablet &symbol_table) override;
 
-  bool typecheck(
+  bool prv_typecheck(
     symbol_tablet &context,
-    const std::string &module) override;
+    const std::string &module,
+    const std::set<std::string> &symbols_to_keep) override;
 
   virtual bool final(symbol_table_baset &context) override;
 

src/ansi-c/ansi_c_language.cpp

@@ -103,9 +103,10 @@ bool ansi_c_languaget::parse(
   return result;
 }
 
-bool ansi_c_languaget::typecheck(
+bool ansi_c_languaget::prv_typecheck(
   symbol_tablet &symbol_table,
-  const std::string &module)
+  const std::string &module,
+  const std::set<std::string> &symbols_to_keep)
 {
   symbol_tablet new_symbol_table;
 

src/ansi-c/ansi_c_language.h

@@ -51,10 +51,13 @@ class ansi_c_languaget:public languaget
   bool generate_support_functions(
     symbol_tablet &symbol_table) override;
 
-  bool typecheck(
+private:
+  bool prv_typecheck(
     symbol_tablet &symbol_table,
-    const std::string &module) override;
+    const std::string &module,
+    const std::set<std::string> &symbols_to_keep) override;
 
+public:
   void show_parse(std::ostream &out) override;
 
   ~ansi_c_languaget() override;

src/cpp/cpp_language.cpp

@@ -119,9 +119,10 @@ bool cpp_languaget::parse(
   return result;
 }
 
-bool cpp_languaget::typecheck(
+bool cpp_languaget::prv_typecheck(
   symbol_tablet &symbol_table,
-  const std::string &module)
+  const std::string &module,
+  const std::set<std::string> &symbols_to_keep)
 {
   if(module=="")
     return false;

src/cpp/cpp_language.h

@@ -42,9 +42,10 @@ class cpp_languaget:public languaget
   bool generate_support_functions(
     symbol_tablet &symbol_table) override;
 
-  bool typecheck(
+  bool prv_typecheck(
     symbol_tablet &symbol_table,
-    const std::string &module) override;
+    const std::string &module,
+    const std::set<std::string> &symbols_to_keep) override;
 
   bool merge_symbol_table(
     symbol_tablet &dest,

src/jsil/jsil_language.cpp

@@ -76,9 +76,10 @@ bool jsil_languaget::parse(
 }
 
 /// Converting from parse tree and type checking.
-bool jsil_languaget::typecheck(
+bool jsil_languaget::prv_typecheck(
   symbol_tablet &symbol_table,
-  const std::string &)
+  const std::string &,
+  const std::set<std::string> &symbols_to_keep)
 {
   if(jsil_typecheck(symbol_table, get_message_handler()))
     return true;

src/jsil/jsil_language.h

@@ -35,10 +35,13 @@ class jsil_languaget:public languaget
   virtual bool generate_support_functions(
     symbol_tablet &symbol_table) override;
 
-  virtual bool typecheck(
+private:
+  virtual bool prv_typecheck(
     symbol_tablet &context,
-    const std::string &module) override;
+    const std::string &module,
+    const std::set<std::string> &symbols_to_keep) override;
 
+public:
   virtual void show_parse(std::ostream &out) override;
 
   virtual ~jsil_languaget();

src/json-symtab-language/json_symtab_language.cpp

@@ -28,9 +28,10 @@ bool json_symtab_languaget::parse(
 /// \param symbol_table: The symbol table containing symbols read from file.
 /// \param module: A useless parameter, there for interface consistency.
 /// \return boolean signifying success or failure of the typechecking.
-bool json_symtab_languaget::typecheck(
+bool json_symtab_languaget::prv_typecheck(
   symbol_tablet &symbol_table,
-  const std::string &module)
+  const std::string &module,
+  const std::set<std::string> &symbols_to_keep)
 {
   (void)module; // unused parameter
 

src/json-symtab-language/json_symtab_language.h

@@ -24,8 +24,10 @@ class json_symtab_languaget : public languaget
 public:
   bool parse(std::istream &instream, const std::string &path) override;
 
-  bool
-  typecheck(symbol_tablet &symbol_table, const std::string &module) override;
+  bool prv_typecheck(
+    symbol_tablet &symbol_table,
+    const std::string &module,
+    const std::set<std::string> &symbols_to_keep) override;
 
   void show_parse(std::ostream &out) override;
 

src/langapi/language.h

@@ -117,11 +117,22 @@ class languaget:public messaget
   virtual bool interfaces(
     symbol_tablet &symbol_table);
 
+private:
+  virtual bool prv_typecheck(
+    symbol_tablet &symbol_table,
+    const std::string &module,
+    const std::set<std::string> &symbols_to_keep) = 0;
+
   // type check a module in the currently parsed file
 
-  virtual bool typecheck(
+public:
+  bool typecheck(
     symbol_tablet &symbol_table,
-    const std::string &module)=0;
+    const std::string &module,
+    const std::set<std::string> &symbols_to_keep = {})
+  {
+    return prv_typecheck(symbol_table, module, symbols_to_keep);
+  }
 
   // language id / description