Merge pull request #8140 from tautschnig/cleanup/java_bytecode_parsert

tautschnig · web-flow · commit 818279377b8e · 2023-12-21T14:27:46.000+01:00
java_bytecode_parsert: construct with message handler
diff --git a/jbmc/src/java_bytecode/java_bytecode_parser.cpp b/jbmc/src/java_bytecode/java_bytecode_parser.cpp
@@ -27,8 +27,10 @@ Author: Daniel Kroening, kroening@kroening.com
 class java_bytecode_parsert final : public parsert
 {
 public:
-  explicit java_bytecode_parsert(bool skip_instructions)
-    : skip_instructions(skip_instructions)
+  java_bytecode_parsert(
+    bool skip_instructions,
+    message_handlert &message_handler)
+    : parsert(message_handler), skip_instructions(skip_instructions)
   {
   }
 
@@ -1809,9 +1811,9 @@ std::optional<java_bytecode_parse_treet> java_bytecode_parse(
   message_handlert &message_handler,
   bool skip_instructions)
 {
-  java_bytecode_parsert java_bytecode_parser(skip_instructions);
+  java_bytecode_parsert java_bytecode_parser(
+    skip_instructions, message_handler);
   java_bytecode_parser.in=&istream;
-  java_bytecode_parser.log.set_message_handler(message_handler);
 
   bool parser_result=java_bytecode_parser.parse();
 

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,10 @@ Author: Daniel Kroening, [email protected]`
`27`	`27`	`class java_bytecode_parsert final : public parsert`
`28`	`28`	`{`
`29`	`29`	`public:`
`30`		`- explicit java_bytecode_parsert(bool skip_instructions)`
`31`		`- : skip_instructions(skip_instructions)`
	`30`	`+ java_bytecode_parsert(`
	`31`	`+ bool skip_instructions,`
	`32`	`+ message_handlert &message_handler)`
	`33`	`+ : parsert(message_handler), skip_instructions(skip_instructions)`
`32`	`34`	`{`
`33`	`35`	`}`
`34`	`36`
`@@ -1809,9 +1811,9 @@ std::optional<java_bytecode_parse_treet> java_bytecode_parse(`
`1809`	`1811`	`message_handlert &message_handler,`
`1810`	`1812`	`bool skip_instructions)`
`1811`	`1813`	`{`
`1812`		`- java_bytecode_parsert java_bytecode_parser(skip_instructions);`
	`1814`	`+ java_bytecode_parsert java_bytecode_parser(`
	`1815`	`+ skip_instructions, message_handler);`
`1813`	`1816`	`java_bytecode_parser.in=&istream;`
`1814`		`- java_bytecode_parser.log.set_message_handler(message_handler);`
`1815`	`1817`
`1816`	`1818`	`bool parser_result=java_bytecode_parser.parse();`
`1817`	`1819`