Skip to content

Commit 3c46430

Browse files
author
Owen
committed
Do not use backtick as opening single quote
Replace it with '. For example, This changes an error message from failed to load class `java.nio.file.Path' to failed to load class 'java.nio.file.Path'
1 parent c7d2ef2 commit 3c46430

File tree

91 files changed

+403
-403
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+403
-403
lines changed

‎jbmc/src/janalyzer/janalyzer_parse_options.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -435,7 +435,7 @@ int janalyzer_parse_optionst::perform_analysis(const optionst &options)
435435
std::ofstream ofs(json_file);
436436
if(!ofs)
437437
{
438-
log.error() << "Failed to open json output `" << json_file << "'"
438+
log.error() << "Failed to open json output '" << json_file << "'"
439439
<< messaget::eom;
440440
return CPROVER_EXIT_INTERNAL_ERROR;
441441
}
@@ -461,7 +461,7 @@ int janalyzer_parse_optionst::perform_analysis(const optionst &options)
461461
std::ofstream ofs(json_file);
462462
if(!ofs)
463463
{
464-
log.error() << "Failed to open json output `" << json_file << "'"
464+
log.error() << "Failed to open json output '" << json_file << "'"
465465
<< messaget::eom;
466466
return CPROVER_EXIT_INTERNAL_ERROR;
467467
}
@@ -487,7 +487,7 @@ int janalyzer_parse_optionst::perform_analysis(const optionst &options)
487487
std::ofstream ofs(json_file);
488488
if(!ofs)
489489
{
490-
log.error() << "Failed to open json output `" << json_file << "'"
490+
log.error() << "Failed to open json output '" << json_file << "'"
491491
<< messaget::eom;
492492
return CPROVER_EXIT_INTERNAL_ERROR;
493493
}
@@ -538,7 +538,7 @@ int janalyzer_parse_optionst::perform_analysis(const optionst &options)
538538

539539
if(!out)
540540
{
541-
log.error() << "Failed to open output file `" << outfile << "'"
541+
log.error() << "Failed to open output file '" << outfile << "'"
542542
<< messaget::eom;
543543
return CPROVER_EXIT_INTERNAL_ERROR;
544544
}

‎jbmc/src/java_bytecode/java_bytecode_parser.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1882,7 +1882,7 @@ java_bytecode_parse(
18821882
if(!in)
18831883
{
18841884
messaget message(message_handler);
1885-
message.error() << "failed to open input file `"
1885+
message.error() << "failed to open input file '"
18861886
<< file << '\'' << messaget::eom;
18871887
return {};
18881888
}

‎jbmc/src/java_bytecode/java_class_loader.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ java_class_loadert::get_parse_tree(
176176
return parse_trees;
177177

178178
// Not found or failed to load
179-
warning() << "failed to load class `" << class_name << '\'' << eom;
179+
warning() << "failed to load class \'" << class_name << '\'' << eom;
180180
parse_trees.emplace_back(class_name);
181181
return parse_trees;
182182
}
@@ -211,10 +211,10 @@ java_class_loadert::read_jar_file(const std::string &jar_path)
211211
}
212212
catch(const std::runtime_error &)
213213
{
214-
error() << "failed to open JAR file `" << jar_path << "'" << eom;
214+
error() << "failed to open JAR file '" << jar_path << "'" << eom;
215215
return {};
216216
}
217-
debug() << "Adding JAR file `" << jar_path << "'" << eom;
217+
debug() << "Adding JAR file '" << jar_path << "'" << eom;
218218

219219
// Create a new entry in the map and initialize using the list of file names
220220
// that are in jar_filet
@@ -224,7 +224,7 @@ java_class_loadert::read_jar_file(const std::string &jar_path)
224224
if(has_suffix(file_name, ".class"))
225225
{
226226
debug()
227-
<< "Found class file " << file_name << " in JAR `" << jar_path << "'"
227+
<< "Found class file " << file_name << " in JAR '" << jar_path << "'"
228228
<< eom;
229229
irep_idt class_name=file_to_class_name(file_name);
230230
classes.push_back(class_name);

‎jbmc/src/java_bytecode/java_class_loader_base.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,15 +142,15 @@ java_class_loader_baset::get_class_from_jar(
142142
if(!data.has_value())
143143
return {};
144144

145-
debug() << "Getting class `" << class_name << "' from JAR " << jar_file
145+
debug() << "Getting class '" << class_name << "' from JAR " << jar_file
146146
<< eom;
147147

148148
std::istringstream istream(*data);
149149
return java_bytecode_parse(istream, get_message_handler());
150150
}
151151
catch(const std::runtime_error &)
152152
{
153-
error() << "failed to open JAR file `" << jar_file << "'" << eom;
153+
error() << "failed to open JAR file '" << jar_file << "'" << eom;
154154
return {};
155155
}
156156
}
@@ -170,7 +170,7 @@ java_class_loader_baset::get_class_from_directory(
170170

171171
if(std::ifstream(full_path))
172172
{
173-
debug() << "Getting class `" << class_name << "' from file " << full_path
173+
debug() << "Getting class '" << class_name << "' from file " << full_path
174174
<< eom;
175175
return java_bytecode_parse(full_path, get_message_handler());
176176
}

‎jbmc/src/jbmc/jbmc_parse_options.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -496,7 +496,7 @@ int jbmc_parse_optionst::doit()
496496

497497
if(!infile)
498498
{
499-
log.error() << "failed to open input file `" << filename << "'"
499+
log.error() << "failed to open input file '" << filename << "'"
500500
<< messaget::eom;
501501
return CPROVER_EXIT_INCORRECT_TASK;
502502
}
@@ -506,7 +506,7 @@ int jbmc_parse_optionst::doit()
506506

507507
if(language==nullptr)
508508
{
509-
log.error() << "failed to figure out type of file `" << filename << "'"
509+
log.error() << "failed to figure out type of file '" << filename << "'"
510510
<< messaget::eom;
511511
return CPROVER_EXIT_INCORRECT_TASK;
512512
}

‎src/analyses/goto_check.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1516,15 +1516,15 @@ void goto_checkt::check_rec_logical_op(const exprt &expr, guardt &guard)
15161516
{
15171517
INVARIANT(
15181518
expr.is_boolean(),
1519-
"`" + expr.id_string() + "' must be Boolean, but got " + expr.pretty());
1519+
"'" + expr.id_string() + "' must be Boolean, but got " + expr.pretty());
15201520

15211521
guardt old_guard = guard;
15221522

15231523
for(const auto &op : expr.operands())
15241524
{
15251525
INVARIANT(
15261526
op.is_boolean(),
1527-
"`" + expr.id_string() + "' takes Boolean operands only, but got " +
1527+
"'" + expr.id_string() + "' takes Boolean operands only, but got " +
15281528
op.pretty());
15291529

15301530
check_rec(op, guard);

‎src/analyses/goto_rw.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ void rw_range_sett::get_objects_address_of(const exprt &object)
478478
get_objects_rec(get_modet::READ, address_of_exprt(tc.op()));
479479
}
480480
else
481-
throw "rw_range_sett: address_of `"+object.id_string()+"' not handled";
481+
throw "rw_range_sett: address_of '"+object.id_string()+"' not handled";
482482
}
483483

484484
void rw_range_sett::add(
@@ -595,7 +595,7 @@ void rw_range_sett::get_objects_rec(
595595
get_objects_rec(mode, *it);
596596
}
597597
else
598-
throw "rw_range_sett: assignment to `"+expr.id_string()+"' not handled";
598+
throw "rw_range_sett: assignment to '"+expr.id_string()+"' not handled";
599599
}
600600

601601
void rw_range_sett::get_objects_rec(get_modet mode, const exprt &expr)

‎src/ansi-c/ansi_c_entry_point.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -144,15 +144,15 @@ bool ansi_c_entry_point(
144144
if(matches.empty())
145145
{
146146
messaget message(message_handler);
147-
message.error() << "main symbol `" << config.main.value() << "' not found"
147+
message.error() << "main symbol '" << config.main.value() << "' not found"
148148
<< messaget::eom;
149149
return true; // give up
150150
}
151151

152152
if(matches.size()>=2)
153153
{
154154
messaget message(message_handler);
155-
message.error() << "main symbol `" << config.main.value()
155+
message.error() << "main symbol '" << config.main.value()
156156
<< "' is ambiguous" << messaget::eom;
157157
return true;
158158
}
@@ -175,7 +175,7 @@ bool ansi_c_entry_point(
175175
if(symbol.value.is_nil())
176176
{
177177
messaget message(message_handler);
178-
message.error() << "main symbol `" << id2string(main_symbol)
178+
message.error() << "main symbol '" << id2string(main_symbol)
179179
<< "' has no body" << messaget::eom;
180180
return false; // give up
181181
}

‎src/ansi-c/builtin_factory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ static bool convert(
8181
if(s_it==new_symbol_table.symbols.end())
8282
{
8383
messaget message(message_handler);
84-
message.error() << "failed to produce built-in symbol `"
84+
message.error() << "failed to produce built-in symbol '"
8585
<< identifier << '\'' << messaget::eom;
8686
return true;
8787
}

‎src/ansi-c/c_preprocess.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ bool c_preprocess_none(
795795
if(!infile)
796796
{
797797
messaget message(message_handler);
798-
message.error() << "failed to open `" << file << "'" << messaget::eom;
798+
message.error() << "failed to open '" << file << "'" << messaget::eom;
799799
return true;
800800
}
801801

‎src/ansi-c/c_typecheck_base.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ void c_typecheck_baset::move_symbol(symbolt &symbol, symbolt *&new_symbol)
3939
if(symbol_table.move(symbol, new_symbol))
4040
{
4141
error().source_location=symbol.location;
42-
error() << "failed to move symbol `" << symbol.name
42+
error() << "failed to move symbol '" << symbol.name
4343
<< "' into symbol table" << eom;
4444
throw 0;
4545
}
@@ -120,7 +120,7 @@ void c_typecheck_baset::typecheck_symbol(symbolt &symbol)
120120
if(old_it->second.is_type!=symbol.is_type)
121121
{
122122
error().source_location=symbol.location;
123-
error() << "redeclaration of `" << symbol.display_name()
123+
error() << "redeclaration of '" << symbol.display_name()
124124
<< "' as a different kind of symbol" << eom;
125125
throw 0;
126126
}
@@ -196,7 +196,7 @@ void c_typecheck_baset::typecheck_redefinition_type(
196196
else
197197
{
198198
error().source_location=new_symbol.location;
199-
error() << "conflicting definition of type symbol `"
199+
error() << "conflicting definition of type symbol '"
200200
<< new_symbol.display_name()
201201
<< '\'' << eom;
202202
throw 0;
@@ -221,7 +221,7 @@ void c_typecheck_baset::typecheck_redefinition_type(
221221
{
222222
// arg! new tag type
223223
error().source_location=new_symbol.location;
224-
error() << "conflicting definition of tag symbol `"
224+
error() << "conflicting definition of tag symbol '"
225225
<< new_symbol.display_name()
226226
<< '\'' << eom;
227227
throw 0;
@@ -247,7 +247,7 @@ void c_typecheck_baset::typecheck_redefinition_type(
247247
if(follow(new_symbol.type)!=follow(old_symbol.type))
248248
{
249249
error().source_location=new_symbol.location;
250-
error() << "type symbol `"
250+
error() << "type symbol '"
251251
<< new_symbol.display_name() << "' defined twice:\n"
252252
<< "Original: " << to_string(old_symbol.type) << "\n"
253253
<< " New: " << to_string(new_symbol.type) << eom;
@@ -312,7 +312,7 @@ void c_typecheck_baset::typecheck_redefinition_non_type(
312312
if(final_old.id()!=ID_code)
313313
{
314314
error().source_location=new_symbol.location;
315-
error() << "error: function symbol `"
315+
error() << "error: function symbol '"
316316
<< new_symbol.display_name()
317317
<< "' redefined with a different type:\n"
318318
<< "Original: " << to_string(old_symbol.type) << "\n"
@@ -370,7 +370,7 @@ void c_typecheck_baset::typecheck_redefinition_non_type(
370370
else
371371
{
372372
error().source_location=new_symbol.location;
373-
error() << "function body `" << new_symbol.display_name()
373+
error() << "function body '" << new_symbol.display_name()
374374
<< "' defined twice" << eom;
375375
throw 0;
376376
}
@@ -437,7 +437,7 @@ void c_typecheck_baset::typecheck_redefinition_non_type(
437437
else
438438
{
439439
error().source_location=new_symbol.location;
440-
error() << "symbol `" << new_symbol.display_name()
440+
error() << "symbol '" << new_symbol.display_name()
441441
<< "' redefined with a different type:\n"
442442
<< "Original: " << to_string(old_symbol.type) << "\n"
443443
<< " New: " << to_string(new_symbol.type) << eom;
@@ -475,7 +475,7 @@ void c_typecheck_baset::typecheck_redefinition_non_type(
475475
else
476476
{
477477
warning().source_location=new_symbol.value.find_source_location();
478-
warning() << "symbol `" << new_symbol.display_name()
478+
warning() << "symbol '" << new_symbol.display_name()
479479
<< "' already has an initial value" << eom;
480480
}
481481
}
@@ -553,7 +553,7 @@ void c_typecheck_baset::typecheck_function_body(symbolt &symbol)
553553
if(labels_defined.find(label.first) == labels_defined.end())
554554
{
555555
error().source_location = label.second;
556-
error() << "branching label `" << label.first
556+
error() << "branching label '" << label.first
557557
<< "' is not defined in function" << eom;
558558
throw 0;
559559
}

‎src/ansi-c/c_typecheck_code.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ void c_typecheck_baset::typecheck_decl(codet &code)
273273
if(s_it==symbol_table.symbols.end())
274274
{
275275
error().source_location = code.source_location();
276-
error() << "failed to find decl symbol `" << identifier
276+
error() << "failed to find decl symbol '" << identifier
277277
<< "' in symbol table" << eom;
278278
throw 0;
279279
}

0 commit comments

Comments
 (0)