File tree Expand file tree Collapse file tree 11 files changed +49
-22
lines changed Expand file tree Collapse file tree 11 files changed +49
-22
lines changed Original file line number Diff line number Diff line change @@ -640,9 +640,10 @@ static void create_stub_global_symbols(
640
640
}
641
641
}
642
642
643
- bool java_bytecode_languaget::typecheck (
643
+ bool java_bytecode_languaget::prv_typecheck (
644
644
symbol_tablet &symbol_table,
645
- const std::string &)
645
+ const std::string &module ,
646
+ const std::set<std::string> &symbols_to_keep)
646
647
{
647
648
PRECONDITION (language_options_initialized);
648
649
Original file line number Diff line number Diff line change @@ -102,9 +102,10 @@ class java_bytecode_languaget:public languaget
102
102
bool generate_support_functions (
103
103
symbol_tablet &symbol_table) override ;
104
104
105
- bool typecheck (
105
+ bool prv_typecheck (
106
106
symbol_tablet &context,
107
- const std::string &module ) override ;
107
+ const std::string &module ,
108
+ const std::set<std::string> &symbols_to_keep) override ;
108
109
109
110
virtual bool final (symbol_table_baset &context) override ;
110
111
Original file line number Diff line number Diff line change @@ -103,9 +103,10 @@ bool ansi_c_languaget::parse(
103
103
return result;
104
104
}
105
105
106
- bool ansi_c_languaget::typecheck (
106
+ bool ansi_c_languaget::prv_typecheck (
107
107
symbol_tablet &symbol_table,
108
- const std::string &module )
108
+ const std::string &module ,
109
+ const std::set<std::string> &symbols_to_keep)
109
110
{
110
111
symbol_tablet new_symbol_table;
111
112
Original file line number Diff line number Diff line change @@ -51,10 +51,13 @@ class ansi_c_languaget:public languaget
51
51
bool generate_support_functions (
52
52
symbol_tablet &symbol_table) override ;
53
53
54
- bool typecheck (
54
+ private:
55
+ bool prv_typecheck (
55
56
symbol_tablet &symbol_table,
56
- const std::string &module ) override ;
57
+ const std::string &module ,
58
+ const std::set<std::string> &symbols_to_keep) override ;
57
59
60
+ public:
58
61
void show_parse (std::ostream &out) override ;
59
62
60
63
~ansi_c_languaget () override ;
Original file line number Diff line number Diff line change @@ -119,9 +119,10 @@ bool cpp_languaget::parse(
119
119
return result;
120
120
}
121
121
122
- bool cpp_languaget::typecheck (
122
+ bool cpp_languaget::prv_typecheck (
123
123
symbol_tablet &symbol_table,
124
- const std::string &module )
124
+ const std::string &module ,
125
+ const std::set<std::string> &symbols_to_keep)
125
126
{
126
127
if (module ==" " )
127
128
return false ;
Original file line number Diff line number Diff line change @@ -42,9 +42,10 @@ class cpp_languaget:public languaget
42
42
bool generate_support_functions (
43
43
symbol_tablet &symbol_table) override ;
44
44
45
- bool typecheck (
45
+ bool prv_typecheck (
46
46
symbol_tablet &symbol_table,
47
- const std::string &module ) override ;
47
+ const std::string &module ,
48
+ const std::set<std::string> &symbols_to_keep) override ;
48
49
49
50
bool merge_symbol_table (
50
51
symbol_tablet &dest,
Original file line number Diff line number Diff line change @@ -76,9 +76,10 @@ bool jsil_languaget::parse(
76
76
}
77
77
78
78
// / Converting from parse tree and type checking.
79
- bool jsil_languaget::typecheck (
79
+ bool jsil_languaget::prv_typecheck (
80
80
symbol_tablet &symbol_table,
81
- const std::string &)
81
+ const std::string &,
82
+ const std::set<std::string> &symbols_to_keep)
82
83
{
83
84
if (jsil_typecheck (symbol_table, get_message_handler ()))
84
85
return true ;
Original file line number Diff line number Diff line change @@ -35,10 +35,13 @@ class jsil_languaget:public languaget
35
35
virtual bool generate_support_functions (
36
36
symbol_tablet &symbol_table) override ;
37
37
38
- virtual bool typecheck (
38
+ private:
39
+ bool prv_typecheck (
39
40
symbol_tablet &context,
40
- const std::string &module ) override ;
41
+ const std::string &module ,
42
+ const std::set<std::string> &symbols_to_keep) override ;
41
43
44
+ public:
42
45
virtual void show_parse (std::ostream &out) override ;
43
46
44
47
virtual ~jsil_languaget ();
Original file line number Diff line number Diff line change @@ -27,10 +27,12 @@ bool json_symtab_languaget::parse(
27
27
// / Typecheck a goto program in json form.
28
28
// / \param symbol_table: The symbol table containing symbols read from file.
29
29
// / \param module: A useless parameter, there for interface consistency.
30
+ // / \param symbols_to_keep: Ignored by this implementation.
30
31
// / \return boolean signifying success or failure of the typechecking.
31
- bool json_symtab_languaget::typecheck (
32
+ bool json_symtab_languaget::prv_typecheck (
32
33
symbol_tablet &symbol_table,
33
- const std::string &module )
34
+ const std::string &module ,
35
+ const std::set<std::string> &symbols_to_keep)
34
36
{
35
37
(void )module ; // unused parameter
36
38
Original file line number Diff line number Diff line change @@ -24,8 +24,10 @@ class json_symtab_languaget : public languaget
24
24
public:
25
25
bool parse (std::istream &instream, const std::string &path) override ;
26
26
27
- bool
28
- typecheck (symbol_tablet &symbol_table, const std::string &module ) override ;
27
+ bool prv_typecheck (
28
+ symbol_tablet &symbol_table,
29
+ const std::string &module ,
30
+ const std::set<std::string> &symbols_to_keep) override ;
29
31
30
32
void show_parse (std::ostream &out) override ;
31
33
You can’t perform that action at this time.
0 commit comments