18
18
19
19
#include < goto-programs/lazy_goto_model.h>
20
20
21
- #include < langapi/mode.h>
22
-
23
21
#include < java_bytecode/java_bytecode_language.h>
24
22
#include < util/file_util.h>
25
23
@@ -38,10 +36,9 @@ symbol_tablet load_java_class_lazy(
38
36
const std::string &class_path,
39
37
const std::string &main)
40
38
{
41
- register_language ( new_java_bytecode_language);
39
+ std::unique_ptr<languaget> lang = new_java_bytecode_language ( );
42
40
43
- return load_java_class (
44
- java_class_name, class_path, main, get_language_from_mode (ID_java));
41
+ return load_java_class (java_class_name, class_path, main, std::move (lang));
45
42
}
46
43
47
44
// / Returns the symbol table from
@@ -192,12 +189,8 @@ std::unique_ptr<goto_modelt> load_goto_model_from_java_class(
192
189
command_line.add_flag (" no-lazy-methods" );
193
190
command_line.add_flag (" no-refine-strings" );
194
191
195
- register_language ( new_java_bytecode_language);
192
+ std::unique_ptr<languaget> lang = new_java_bytecode_language ( );
196
193
197
194
return load_goto_model_from_java_class (
198
- java_class_name,
199
- class_path,
200
- main,
201
- get_language_from_mode (ID_java),
202
- command_line);
195
+ java_class_name, class_path, main, std::move (lang), command_line);
203
196
}
0 commit comments