Skip to content

Commit 476ebc2

Browse files
tautschnigtautschnig
committed
Replace quoting via " in messages by quote_begin and quote_end
This is in the spirit of #4875, but now using quote_begin/quote_end stream modifiers.
1 parent 8c6b7cb commit 476ebc2

File tree

9 files changed

+52
-38
lines changed

9 files changed

+52
-38
lines changed

‎jbmc/regression/jbmc/lambda1/test_goto_functions.desc

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
CORE
22
Lambdatest
33
--verbosity 10 --show-goto-functions --function Lambdatest.main --cp `../../../../scripts/format_classpath.sh . ../../../lib/java-models-library/target/core-models.jar ../../../lib/java-models-library/target/cprover-api.jar`
4-
lambda function reference lambda\$new\$0 in class \"Lambdatest\"
5-
lambda function reference lambda\$new\$1 in class \"Lambdatest\"
6-
lambda function reference lambda\$captureReference\$2 in class \"Lambdatest\"
7-
lambda function reference lambda\$captureInt\$3 in class \"Lambdatest\"
8-
lambda function reference lambda\$captureThisPrimitive\$4 in class \"Lambdatest\"
9-
lambda function reference lambda\$captureThisReference\$5 in class \"Lambdatest\"
10-
lambda function reference lambda\$captureAndCall\$6 in class \"Lambdatest\"
11-
lambda function reference lambda\$captureAndAssign\$7 in class \"Lambdatest\"
12-
lambda function reference lambda\$static\$0 in class \"B\"
4+
lambda function reference lambda\$new\$0 in class 'Lambdatest'
5+
lambda function reference lambda\$new\$1 in class 'Lambdatest'
6+
lambda function reference lambda\$captureReference\$2 in class 'Lambdatest'
7+
lambda function reference lambda\$captureInt\$3 in class 'Lambdatest'
8+
lambda function reference lambda\$captureThisPrimitive\$4 in class 'Lambdatest'
9+
lambda function reference lambda\$captureThisReference\$5 in class 'Lambdatest'
10+
lambda function reference lambda\$captureAndCall\$6 in class 'Lambdatest'
11+
lambda function reference lambda\$captureAndAssign\$7 in class 'Lambdatest'
12+
lambda function reference lambda\$static\$0 in class 'B'
1313
^EXIT=0$
1414
^SIGNAL=0$

‎jbmc/regression/jbmc/lambda2/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
CORE symex-driven-lazy-loading-expected-failure
22
org.symphonyoss.symphony.clients.model.SymStream
33
--show-goto-functions --verbosity 10
4-
lambda function reference toSymUser in class "org\.symphonyoss\.symphony\.clients\.model\.SymStream"
4+
lambda function reference toSymUser in class 'org\.symphonyoss\.symphony\.clients\.model\.SymStream'
55
^EXIT=0$
66
^SIGNAL=0$
77
--

‎jbmc/src/java_bytecode/java_bytecode_parser.cpp

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2101,13 +2101,11 @@ void java_bytecode_parsert::read_bootstrapmethods_entry()
21012101

21022102
log.debug()
21032103
<< "lambda function reference "
2104-
<< id2string(
2105-
lambda_method_handle->get_method_descriptor().base_method_name())
2106-
<< " in class \"" << parse_tree.parsed_class.name << "\""
2107-
<< "\n interface type is "
2108-
<< id2string(pool_entry(interface_type_argument.ref1).s)
2109-
<< "\n method type is "
2110-
<< id2string(pool_entry(method_type_argument.ref1).s) << messaget::eom;
2104+
<< lambda_method_handle->get_method_descriptor().base_method_name()
2105+
<< " in class " << messaget::quote_begin << parse_tree.parsed_class.name
2106+
<< messaget::quote_end << "\n interface type is "
2107+
<< pool_entry(interface_type_argument.ref1).s << "\n method type is "
2108+
<< pool_entry(method_type_argument.ref1).s << messaget::eom;
21112109
parse_tree.parsed_class.add_method_handle(
21122110
bootstrap_method_index, *lambda_method_handle);
21132111
}

‎src/cpp/cpp_typecheck_function.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ void cpp_typecheckt::convert_parameter(
5656
if(symbol_table.move(symbol, new_symbol))
5757
{
5858
error().source_location=symbol.location;
59-
error() << "cpp_typecheckt::convert_parameter: symbol_table.move(\""
60-
<< symbol.name << "\") failed" << eom;
59+
error() << "cpp_typecheckt::convert_parameter: symbol_table.move("
60+
<< quote_begin << symbol.name << quote_end << ") failed" << eom;
6161
throw 0;
6262
}
6363

‎src/goto-analyzer/taint_parser.cpp

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,13 @@ bool taint_parser(
6464
else
6565
{
6666
messaget message(message_handler);
67-
message.error() << "taint rule must have \"kind\" which is "
68-
"\"source\" or \"sink\" or \"sanitizer\""
69-
<< messaget::eom;
67+
message.error() << "taint rule must have " << messaget::quote_begin
68+
<< "kind" << messaget::quote_end << " which is "
69+
<< messaget::quote_begin << "source"
70+
<< messaget::quote_end << " or " << messaget::quote_begin
71+
<< "sink" << messaget::quote_end << " or "
72+
<< messaget::quote_begin << "sanitizer"
73+
<< messaget::quote_end << messaget::eom;
7074
return true;
7175
}
7276

@@ -75,8 +79,8 @@ bool taint_parser(
7579
if(function.empty())
7680
{
7781
messaget message(message_handler);
78-
message.error() << "taint rule must have \"function\""
79-
<< messaget::eom;
82+
message.error() << "taint rule must have " << messaget::quote_begin
83+
<< "function" << messaget::quote_end << messaget::eom;
8084
return true;
8185
}
8286
else
@@ -101,10 +105,13 @@ bool taint_parser(
101105
else
102106
{
103107
messaget message(message_handler);
104-
message.error() << "taint rule must have \"where\""
105-
<< " which is \"return_value\" or \"this\" "
106-
<< "or \"parameter1\"..."
107-
<< messaget::eom;
108+
message.error() << "taint rule must have " << messaget::quote_begin
109+
<< "where" << messaget::quote_end << " which is "
110+
<< messaget::quote_begin << "return_value"
111+
<< messaget::quote_end << " or " << messaget::quote_begin
112+
<< "this" << messaget::quote_end << " or "
113+
<< messaget::quote_begin << "parameter1"
114+
<< messaget::quote_end << "..." << messaget::eom;
108115
return true;
109116
}
110117

‎src/linking/linking.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -679,7 +679,8 @@ void linkingt::duplicate_object_symbol(
679679
log.warning().source_location = new_symbol.location;
680680

681681
log.warning() << "conflicting initializers for"
682-
<< " variable '" << old_symbol.name << "'\n";
682+
<< " variable " << messaget::quote_begin
683+
<< old_symbol.name << messaget::quote_end << '\n';
683684
log.warning() << "using old value in module " << old_symbol.module
684685
<< " " << old_symbol.value.find_source_location() << '\n'
685686
<< from_expr(ns, old_symbol.name, tmp_old) << '\n';

‎src/linking/linking_diagnostics.cpp

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -370,11 +370,14 @@ void linking_diagnosticst::error(
370370
messaget log{message_handler};
371371
log.error().source_location = new_symbol.location;
372372

373-
log.error() << msg << " '" << old_symbol.display_name() << "'" << '\n';
374-
log.error() << "old definition in module '" << old_symbol.module << "' "
373+
log.error() << msg << ' ' << messaget::quote_begin
374+
<< old_symbol.display_name() << messaget::quote_end << '\n';
375+
log.error() << "old definition in module " << messaget::quote_begin
376+
<< old_symbol.module << messaget::quote_end << ' '
375377
<< old_symbol.location << '\n'
376378
<< type_to_string_verbose(old_symbol) << '\n';
377-
log.error() << "new definition in module '" << new_symbol.module << "' "
379+
log.error() << "new definition in module " << messaget::quote_begin
380+
<< new_symbol.module << messaget::quote_end << ' '
378381
<< new_symbol.location << '\n'
379382
<< type_to_string_verbose(new_symbol) << messaget::eom;
380383
}
@@ -387,11 +390,14 @@ void linking_diagnosticst::warning(
387390
messaget log{message_handler};
388391
log.warning().source_location = new_symbol.location;
389392

390-
log.warning() << msg << " '" << old_symbol.display_name() << "'\n";
391-
log.warning() << "old definition in module " << old_symbol.module << " "
393+
log.warning() << msg << ' ' << messaget::quote_begin
394+
<< old_symbol.display_name() << messaget::quote_end << '\n';
395+
log.warning() << "old definition in module " << messaget::quote_begin
396+
<< old_symbol.module << messaget::quote_end << ' '
392397
<< old_symbol.location << '\n'
393398
<< type_to_string_verbose(old_symbol) << '\n';
394-
log.warning() << "new definition in module " << new_symbol.module << " "
399+
log.warning() << "new definition in module " << messaget::quote_begin
400+
<< new_symbol.module << messaget::quote_end << ' '
395401
<< new_symbol.location << '\n'
396402
<< type_to_string_verbose(new_symbol) << messaget::eom;
397403
}

‎src/solvers/smt2/smt2_dec.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,8 @@ decision_proceduret::resultt smt2_dect::read_result(std::istream &in)
215215
const auto &message = id2string(parsed.get_sub()[1].id());
216216
messaget log{message_handler};
217217
log.error() << "SMT2 solver returned error message:\n"
218-
<< "\t\"" << message << "\"" << messaget::eom;
218+
<< "\t" << messaget::quote_begin << message
219+
<< messaget::quote_end << messaget::eom;
219220
return decision_proceduret::resultt::D_ERROR;
220221
}
221222
}

‎src/solvers/strings/string_refinement.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1107,8 +1107,9 @@ static exprt get_char_array_and_concretize(
11071107
const auto array_expr =
11081108
expr_try_dynamic_cast<array_exprt>(*concretized_array))
11091109
{
1110-
stream << std::string(4, ' ') << "- as_string: \""
1111-
<< string_of_array(*array_expr) << "\"\n";
1110+
stream << std::string(4, ' ')
1111+
<< "- as_string: " << messaget::quote_begin
1112+
<< string_of_array(*array_expr) << messaget::quote_end << '\n';
11121113
}
11131114
else
11141115
stream << std::string(2, ' ') << "- warning: not an array"

0 commit comments

Comments
 (0)