Skip to content

Commit 7dd8899

Browse files
author
owen-jones-diffblue
authored
Merge pull request #4875 from owen-jones-diffblue/owen/replace-backtick-with-single-quote
Replace `<stuff>' with '<stuff>'
2 parents 306697d + 4c900d1 commit 7dd8899

File tree

139 files changed

+604
-711
lines changed

Some content is hidden

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

139 files changed

+604
-711
lines changed

‎jbmc/regression/jbmc/class-loading-annotations/test-array-value-annotation-on-class.desc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ ArrayValueAnnotationOnClass.class
33
--verbosity 10
44
^EXIT=6$
55
^SIGNAL=0$
6-
Getting class `MyClassA' from file \.[\\/]MyClassA\.class
7-
Getting class `MyClassB' from file \.[\\/]MyClassB\.class
6+
Getting class 'MyClassA' from file \.[\\/]MyClassA\.class
7+
Getting class 'MyClassB' from file \.[\\/]MyClassB\.class
88
--
99
--
1010
This test checks that element classes of arrays that are given as values of a class-level annotation

‎jbmc/regression/jbmc/class-loading-annotations/test-array-value-annotation-on-field.desc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ ArrayValueAnnotationOnField.class
33
--verbosity 10
44
^EXIT=6$
55
^SIGNAL=0$
6-
Getting class `MyClassA' from file \.[\\/]MyClassA\.class
7-
Getting class `MyClassB' from file \.[\\/]MyClassB\.class
6+
Getting class 'MyClassA' from file \.[\\/]MyClassA\.class
7+
Getting class 'MyClassB' from file \.[\\/]MyClassB\.class
88
--
99
--
1010
This test checks that element classes of arrays that are given as values of a field-level annotation

‎jbmc/regression/jbmc/class-loading-annotations/test-array-value-annotation-on-method.desc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ ArrayValueAnnotationOnMethod.class
33
--verbosity 10
44
^EXIT=6$
55
^SIGNAL=0$
6-
Getting class `MyClassA' from file \.[\\/]MyClassA\.class
7-
Getting class `MyClassB' from file \.[\\/]MyClassB\.class
6+
Getting class 'MyClassA' from file \.[\\/]MyClassA\.class
7+
Getting class 'MyClassB' from file \.[\\/]MyClassB\.class
88
--
99
--
1010
This test checks that element classes of arrays that are given as values of a method-level

‎jbmc/regression/jbmc/class-loading-annotations/test-array-value-annotation-on-parameter.desc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ ArrayValueAnnotationOnParameter.class
33
--verbosity 10
44
^EXIT=6$
55
^SIGNAL=0$
6-
Getting class `MyClassA' from file \.[\\/]MyClassA\.class
7-
Getting class `MyClassB' from file \.[\\/]MyClassB\.class
6+
Getting class 'MyClassA' from file \.[\\/]MyClassA\.class
7+
Getting class 'MyClassB' from file \.[\\/]MyClassB\.class
88
--
99
--
1010
This test checks that element classes of arrays that are given as values of an annotation at method

‎jbmc/regression/jbmc/class-loading-annotations/test-class-value-annotation-on-class.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ClassValueAnnotationOnClass.class
33
--verbosity 10
44
^EXIT=6$
55
^SIGNAL=0$
6-
Getting class `MyClassA' from file \.[\\/]MyClassA\.class
6+
Getting class 'MyClassA' from file \.[\\/]MyClassA\.class
77
--
88
MyClassB
99
--

‎jbmc/regression/jbmc/class-loading-annotations/test-class-value-annotation-on-field.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ClassValueAnnotationOnField.class
33
--verbosity 10
44
^EXIT=6$
55
^SIGNAL=0$
6-
Getting class `MyClassA' from file \.[\\/]MyClassA\.class
6+
Getting class 'MyClassA' from file \.[\\/]MyClassA\.class
77
--
88
MyClassB
99
--

‎jbmc/regression/jbmc/class-loading-annotations/test-class-value-annotation-on-method.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ClassValueAnnotationOnMethod.class
33
--verbosity 10
44
^EXIT=6$
55
^SIGNAL=0$
6-
Getting class `MyClassA' from file \.[\\/]MyClassA\.class
6+
Getting class 'MyClassA' from file \.[\\/]MyClassA\.class
77
--
88
MyClassB
99
--

‎jbmc/regression/jbmc/class-loading-annotations/test-class-value-annotation-on-parameter.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ ClassValueAnnotationOnParameter.class
33
--verbosity 10
44
^EXIT=6$
55
^SIGNAL=0$
6-
Getting class `MyClassA' from file \.[\\/]MyClassA\.class
6+
Getting class 'MyClassA' from file \.[\\/]MyClassA\.class
77
--
88
MyClassB
99
--

‎jbmc/regression/jbmc/classpath-class-incorrect-package/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Test.class
55
^SIGNAL=0$
66
--
77
Java main class: Test
8-
failed to open input file `Test.class'
8+
failed to open input file 'Test.class'
99
--
1010
Test.class is not in the right directory corresponding to its package.
1111
Issue: 2864

‎jbmc/regression/jbmc/classpath-invalid/test-jar.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Test.class
44
^EXIT=6$
55
^SIGNAL=0$
66
^the program has no entry point$
7-
^failed to load class `Test'$
7+
^failed to load class Test$
88
--
99
--
1010
symex-driven lazy loading should emit "the program has no entry point" but currently doesn't

‎jbmc/regression/jbmc/classpath-invalid/test-path.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Test.class
44
^EXIT=6$
55
^SIGNAL=0$
66
^the program has no entry point$
7-
^failed to load class `Test'$
7+
^failed to load class Test$
88
--
99
--
1010
symex-driven lazy loading should emit "the program has no entry point" but currently doesn't

‎jbmc/regression/jbmc/classpath-jar-entry-method/test.desc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ jar_file.jar
44
^EXIT=10$
55
^SIGNAL=0$
66
VERIFICATION FAILED
7-
Getting class `RelevantClass' from JAR jar_file.jar
8-
Getting class `RelatedClass' from JAR jar_file.jar
7+
Getting class 'RelevantClass' from JAR jar_file.jar
8+
Getting class 'RelatedClass' from JAR jar_file.jar
99
--
10-
Getting class `IrrelevantClass' from JAR jar_file.jar
10+
Getting class 'IrrelevantClass' from JAR jar_file.jar
1111
--
1212
This test checks that when JBMC is given a jar file as an argument and an entry
1313
method is specified with --function, only classes that are (possibly

‎jbmc/regression/jbmc/classpath-jar-incorrect-package/test_class.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Test.class
55
^SIGNAL=0$
66
--
77
Java main class: Test
8-
failed to open input file `Test.class'
8+
failed to open input file 'Test.class'
99
--
1010
Test.class is not in the right directory corresponding to its package.
1111
Issue: 2864

‎jbmc/regression/jbmc/classpath-jar-incorrect-package/test_jar_main_class.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ test.jar
55
^SIGNAL=0$
66
--
77
Java main class: Test
8-
failed to open input file `Test.class'
8+
failed to open input file 'Test.class'
99
--
1010
Test.class is not in the right directory corresponding to its package.
1111
Issue: 2864

‎jbmc/regression/jbmc/generics_type_param/test.desc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ Reading class AWrapper
77
Reading class FWrapper
88
Reading class IWrapper
99
--
10-
failed to load class \`AWrapper\'
11-
failed to load class \`FWrapper\'
12-
failed to load class \`IWrapper\'
10+
failed to load class AWrapper
11+
failed to load class FWrapper
12+
failed to load class IWrapper

‎jbmc/regression/jbmc/overlay-class/correct-test.desc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
CORE
22
Test.class
33
--classpath `../../../../scripts/format_classpath.sh . annotations correct-overlay` --verbosity 10
4-
^Getting class `Test' from file \.[\\/]Test\.class$
5-
^Getting class `Test' from file correct-overlay[\\/]Test\.class$
4+
^Getting class 'Test' from file \.[\\/]Test\.class$
5+
^Getting class 'Test' from file correct-overlay[\\/]Test\.class$
66
^Adding symbol from overlay class: field 'x'$
77
^Adding symbol from overlay class: method 'java::Test\.<init>:\(\)V'$
88
^Field definition for java::Test\.x already loaded from overlay class$

‎jbmc/regression/jbmc/overlay-class/duplicate-test.desc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
CORE
22
Test.class
33
--classpath `../../../../scripts/format_classpath.sh . annotations . correct-overlay` --verbosity 10
4-
^Getting class `Test' from file \.[\\/]Test\.class$
5-
^Getting class `Test' from file correct-overlay[\\/]Test\.class$
4+
^Getting class 'Test' from file \.[\\/]Test\.class$
5+
^Getting class 'Test' from file correct-overlay[\\/]Test\.class$
66
^Skipping duplicate definition of class Test not marked with OverlayClassImplementation$
77
^Adding symbol from overlay class: field 'x'$
88
^Adding symbol from overlay class: method 'java::Test\.<init>:\(\)V'$

‎jbmc/regression/jbmc/overlay-class/misordered-test.desc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
CORE
22
Test.class
33
--classpath `../../../../scripts/format_classpath.sh annotations correct-overlay .` --verbosity 10
4-
^Getting class `Test' from file correct-overlay[\\/]Test\.class$
5-
^Getting class `Test' from file \.[\\/]Test\.class$
4+
^Getting class 'Test' from file correct-overlay[\\/]Test\.class$
5+
^Getting class 'Test' from file \.[\\/]Test\.class$
66
^Skipping class Test marked with OverlayClassImplementation but found before original definition$
77
^Adding symbol: field 'x'$
88
^Adding symbol: method 'java::Test\.main:\(\[Ljava/lang/String;\)V'$

‎jbmc/regression/jbmc/overlay-class/unmarked-test.desc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
CORE
22
Test.class
33
--classpath `../../../../scripts/format_classpath.sh . annotations unmarked-overlay` --verbosity 10
4-
^Getting class `Test' from file \.[\\/]Test\.class$
5-
^Getting class `Test' from file unmarked-overlay[\\/]Test\.class$
4+
^Getting class 'Test' from file \.[\\/]Test\.class$
5+
^Getting class 'Test' from file unmarked-overlay[\\/]Test\.class$
66
^Skipping duplicate definition of class Test not marked with OverlayClassImplementation$
77
^Adding symbol: field 'x'$
88
^Adding symbol: method 'java::Test\.main:\(\[Ljava/lang/String;\)V'$

‎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: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1851,8 +1851,8 @@ java_bytecode_parse(
18511851
if(!in)
18521852
{
18531853
messaget message(message_handler);
1854-
message.error() << "failed to open input file `"
1855-
<< file << '\'' << messaget::eom;
1854+
message.error() << "failed to open input file '" << file << '\''
1855+
<< messaget::eom;
18561856
return {};
18571857
}
18581858

‎jbmc/src/java_bytecode/java_class_loader.cpp

Lines changed: 5 additions & 6 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
@@ -223,9 +223,8 @@ java_class_loadert::read_jar_file(const std::string &jar_path)
223223
{
224224
if(has_suffix(file_name, ".class"))
225225
{
226-
debug()
227-
<< "Found class file " << file_name << " in JAR `" << jar_path << "'"
228-
<< eom;
226+
debug() << "Found class file " << file_name << " in JAR '" << jar_path
227+
<< "'" << eom;
229228
irep_idt class_name=file_to_class_name(file_name);
230229
classes.push_back(class_name);
231230
}

‎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
}

‎regression/ansi-c/Array_Declarator8/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ main.c
44
^EXIT=(64|1)$
55
^SIGNAL=0$
66
^CONVERSION ERROR$
7-
array size of static symbol `B' is not constant$
7+
array size of static symbol 'B' is not constant$
88
--
99
^warning: ignoring

‎regression/ansi-c/linking_conflicts1/test.desc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ other.c
44
^EXIT=(64|1)$
55
^SIGNAL=0$
66
^CONVERSION ERROR$
7-
error: conflicting function declarations `bar'
8-
error: conflicting function declarations `bar2'
7+
error: conflicting function declarations 'bar'
8+
error: conflicting function declarations 'bar2'
99
--
1010
^warning: ignoring

‎regression/ansi-c/linking_conflicts2/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,6 @@ other.c
44
^EXIT=(64|1)$
55
^SIGNAL=0$
66
^CONVERSION ERROR$
7-
error: conflicting function declarations `foo'
7+
error: conflicting function declarations 'foo'
88
--
99
^warning: ignoring

‎regression/ansi-c/message_handling1/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@ main.c
44
^EXIT=0$
55
^SIGNAL=0$
66
--
7-
encountered goto `bla' that enters one or more lexical blocks
7+
encountered goto 'bla' that enters one or more lexical blocks

‎regression/ansi-c/static2/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
CORE test-c++-front-end
22
main.c
33
main2.c --function foo
4-
^main symbol `foo' is ambiguous$
4+
^main symbol 'foo' is ambiguous$
55
^EXIT=(1|64)$
66
^SIGNAL=0$
77
--

‎regression/ansi-c/static3/test.desc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
CORE test-c++-front-end
22
main.c
33
main2.c --function foo
4-
^main symbol `foo' is ambiguous$
4+
^main symbol 'foo' is ambiguous$
55
^EXIT=(1|64)$
66
^SIGNAL=0$
77
--

‎regression/cbmc-cover/mcdc1/test.desc

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ main.c
33
--cover mcdc
44
^EXIT=0$
55
^SIGNAL=0$
6-
^\[main.coverage.\d+\] file main.c line 14 function main MC/DC independence condition `C && D && !E && A && !B.*: SATISFIED$
7-
^\[main.coverage.\d+\] file main.c line 14 function main MC/DC independence condition `C && !D && E && A && !B.*: SATISFIED$
8-
^\[main.coverage.\d+\] file main.c line 14 function main MC/DC independence condition `!C && D && E && A && !B.*: SATISFIED$
9-
^\[main.coverage.\d+\] file main.c line 14 function main MC/DC independence condition `C && D && E && A && !B.*: SATISFIED$
10-
^\[main.coverage.\d+\] file main.c line 14 function main MC/DC independence condition `C && D && E && !A && B.*: SATISFIED$
11-
^\[main.coverage.\d+\] file main.c line 14 function main MC/DC independence condition `C && D && E && !A && !B.*: SATISFIED$
6+
^\[main.coverage.\d+\] file main.c line 14 function main MC/DC independence condition 'C && D && !E && A && !B.*: SATISFIED$
7+
^\[main.coverage.\d+\] file main.c line 14 function main MC/DC independence condition 'C && !D && E && A && !B.*: SATISFIED$
8+
^\[main.coverage.\d+\] file main.c line 14 function main MC/DC independence condition '!C && D && E && A && !B.*: SATISFIED$
9+
^\[main.coverage.\d+\] file main.c line 14 function main MC/DC independence condition 'C && D && E && A && !B.*: SATISFIED$
10+
^\[main.coverage.\d+\] file main.c line 14 function main MC/DC independence condition 'C && D && E && !A && B.*: SATISFIED$
11+
^\[main.coverage.\d+\] file main.c line 14 function main MC/DC independence condition 'C && D && E && !A && !B.*: SATISFIED$
1212
^\*\* .* of .* covered \(100.0%\)$
1313
--
1414
^warning: ignoring

0 commit comments

Comments
 (0)