Skip to content

Commit 475dbcc

Browse files
author
thk123
committed
Don't register languages in load_java_class
Is simpler and possible to just create and pass in.
1 parent fe57f69 commit 475dbcc

File tree

1 file changed

+4
-11
lines changed

1 file changed

+4
-11
lines changed

jbmc/unit/java-testing-utils/load_java_class.cpp

Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
#include <goto-programs/lazy_goto_model.h>
2020

21-
#include <langapi/mode.h>
22-
2321
#include <java_bytecode/java_bytecode_language.h>
2422
#include <util/file_util.h>
2523

@@ -38,10 +36,9 @@ symbol_tablet load_java_class_lazy(
3836
const std::string &class_path,
3937
const std::string &main)
4038
{
41-
register_language(new_java_bytecode_language);
39+
std::unique_ptr<languaget> lang = new_java_bytecode_language();
4240

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));
4542
}
4643

4744
/// Returns the symbol table from
@@ -192,12 +189,8 @@ std::unique_ptr<goto_modelt> load_goto_model_from_java_class(
192189
command_line.add_flag("no-lazy-methods");
193190
command_line.add_flag("no-refine-strings");
194191

195-
register_language(new_java_bytecode_language);
192+
std::unique_ptr<languaget> lang = new_java_bytecode_language();
196193

197194
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);
203196
}

0 commit comments

Comments
 (0)