Skip to content

Replace `<stuff>' with '<stuff>' #4875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ ArrayValueAnnotationOnClass.class
--verbosity 10
^EXIT=6$
^SIGNAL=0$
Getting class `MyClassA' from file \.[\\/]MyClassA\.class
Getting class `MyClassB' from file \.[\\/]MyClassB\.class
Getting class 'MyClassA' from file \.[\\/]MyClassA\.class
Getting class 'MyClassB' from file \.[\\/]MyClassB\.class
--
--
This test checks that element classes of arrays that are given as values of a class-level annotation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ ArrayValueAnnotationOnField.class
--verbosity 10
^EXIT=6$
^SIGNAL=0$
Getting class `MyClassA' from file \.[\\/]MyClassA\.class
Getting class `MyClassB' from file \.[\\/]MyClassB\.class
Getting class 'MyClassA' from file \.[\\/]MyClassA\.class
Getting class 'MyClassB' from file \.[\\/]MyClassB\.class
--
--
This test checks that element classes of arrays that are given as values of a field-level annotation
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ ArrayValueAnnotationOnMethod.class
--verbosity 10
^EXIT=6$
^SIGNAL=0$
Getting class `MyClassA' from file \.[\\/]MyClassA\.class
Getting class `MyClassB' from file \.[\\/]MyClassB\.class
Getting class 'MyClassA' from file \.[\\/]MyClassA\.class
Getting class 'MyClassB' from file \.[\\/]MyClassB\.class
--
--
This test checks that element classes of arrays that are given as values of a method-level
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ ArrayValueAnnotationOnParameter.class
--verbosity 10
^EXIT=6$
^SIGNAL=0$
Getting class `MyClassA' from file \.[\\/]MyClassA\.class
Getting class `MyClassB' from file \.[\\/]MyClassB\.class
Getting class 'MyClassA' from file \.[\\/]MyClassA\.class
Getting class 'MyClassB' from file \.[\\/]MyClassB\.class
--
--
This test checks that element classes of arrays that are given as values of an annotation at method
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ClassValueAnnotationOnClass.class
--verbosity 10
^EXIT=6$
^SIGNAL=0$
Getting class `MyClassA' from file \.[\\/]MyClassA\.class
Getting class 'MyClassA' from file \.[\\/]MyClassA\.class
--
MyClassB
--
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ClassValueAnnotationOnField.class
--verbosity 10
^EXIT=6$
^SIGNAL=0$
Getting class `MyClassA' from file \.[\\/]MyClassA\.class
Getting class 'MyClassA' from file \.[\\/]MyClassA\.class
--
MyClassB
--
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ClassValueAnnotationOnMethod.class
--verbosity 10
^EXIT=6$
^SIGNAL=0$
Getting class `MyClassA' from file \.[\\/]MyClassA\.class
Getting class 'MyClassA' from file \.[\\/]MyClassA\.class
--
MyClassB
--
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ ClassValueAnnotationOnParameter.class
--verbosity 10
^EXIT=6$
^SIGNAL=0$
Getting class `MyClassA' from file \.[\\/]MyClassA\.class
Getting class 'MyClassA' from file \.[\\/]MyClassA\.class
--
MyClassB
--
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Test.class
^SIGNAL=0$
--
Java main class: Test
failed to open input file `Test.class'
failed to open input file 'Test.class'
--
Test.class is not in the right directory corresponding to its package.
Issue: 2864
2 changes: 1 addition & 1 deletion jbmc/regression/jbmc/classpath-invalid/test-jar.desc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Test.class
^EXIT=6$
^SIGNAL=0$
^the program has no entry point$
^failed to load class `Test'$
^failed to load class Test$
--
--
symex-driven lazy loading should emit "the program has no entry point" but currently doesn't
2 changes: 1 addition & 1 deletion jbmc/regression/jbmc/classpath-invalid/test-path.desc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Test.class
^EXIT=6$
^SIGNAL=0$
^the program has no entry point$
^failed to load class `Test'$
^failed to load class Test$
--
--
symex-driven lazy loading should emit "the program has no entry point" but currently doesn't
6 changes: 3 additions & 3 deletions jbmc/regression/jbmc/classpath-jar-entry-method/test.desc
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ jar_file.jar
^EXIT=10$
^SIGNAL=0$
VERIFICATION FAILED
Getting class `RelevantClass' from JAR jar_file.jar
Getting class `RelatedClass' from JAR jar_file.jar
Getting class 'RelevantClass' from JAR jar_file.jar
Getting class 'RelatedClass' from JAR jar_file.jar
--
Getting class `IrrelevantClass' from JAR jar_file.jar
Getting class 'IrrelevantClass' from JAR jar_file.jar
--
This test checks that when JBMC is given a jar file as an argument and an entry
method is specified with --function, only classes that are (possibly
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Test.class
^SIGNAL=0$
--
Java main class: Test
failed to open input file `Test.class'
failed to open input file 'Test.class'
--
Test.class is not in the right directory corresponding to its package.
Issue: 2864
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ test.jar
^SIGNAL=0$
--
Java main class: Test
failed to open input file `Test.class'
failed to open input file 'Test.class'
--
Test.class is not in the right directory corresponding to its package.
Issue: 2864
6 changes: 3 additions & 3 deletions jbmc/regression/jbmc/generics_type_param/test.desc
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,6 @@ Reading class AWrapper
Reading class FWrapper
Reading class IWrapper
--
failed to load class \`AWrapper\'
failed to load class \`FWrapper\'
failed to load class \`IWrapper\'
failed to load class AWrapper
failed to load class FWrapper
failed to load class IWrapper
4 changes: 2 additions & 2 deletions jbmc/regression/jbmc/overlay-class/correct-test.desc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
CORE
Test.class
--classpath `../../../../scripts/format_classpath.sh . annotations correct-overlay` --verbosity 10
^Getting class `Test' from file \.[\\/]Test\.class$
^Getting class `Test' from file correct-overlay[\\/]Test\.class$
^Getting class 'Test' from file \.[\\/]Test\.class$
^Getting class 'Test' from file correct-overlay[\\/]Test\.class$
^Adding symbol from overlay class: field 'x'$
^Adding symbol from overlay class: method 'java::Test\.<init>:\(\)V'$
^Field definition for java::Test\.x already loaded from overlay class$
Expand Down
4 changes: 2 additions & 2 deletions jbmc/regression/jbmc/overlay-class/duplicate-test.desc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
CORE
Test.class
--classpath `../../../../scripts/format_classpath.sh . annotations . correct-overlay` --verbosity 10
^Getting class `Test' from file \.[\\/]Test\.class$
^Getting class `Test' from file correct-overlay[\\/]Test\.class$
^Getting class 'Test' from file \.[\\/]Test\.class$
^Getting class 'Test' from file correct-overlay[\\/]Test\.class$
^Skipping duplicate definition of class Test not marked with OverlayClassImplementation$
^Adding symbol from overlay class: field 'x'$
^Adding symbol from overlay class: method 'java::Test\.<init>:\(\)V'$
Expand Down
4 changes: 2 additions & 2 deletions jbmc/regression/jbmc/overlay-class/misordered-test.desc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
CORE
Test.class
--classpath `../../../../scripts/format_classpath.sh annotations correct-overlay .` --verbosity 10
^Getting class `Test' from file correct-overlay[\\/]Test\.class$
^Getting class `Test' from file \.[\\/]Test\.class$
^Getting class 'Test' from file correct-overlay[\\/]Test\.class$
^Getting class 'Test' from file \.[\\/]Test\.class$
^Skipping class Test marked with OverlayClassImplementation but found before original definition$
^Adding symbol: field 'x'$
^Adding symbol: method 'java::Test\.main:\(\[Ljava/lang/String;\)V'$
Expand Down
4 changes: 2 additions & 2 deletions jbmc/regression/jbmc/overlay-class/unmarked-test.desc
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
CORE
Test.class
--classpath `../../../../scripts/format_classpath.sh . annotations unmarked-overlay` --verbosity 10
^Getting class `Test' from file \.[\\/]Test\.class$
^Getting class `Test' from file unmarked-overlay[\\/]Test\.class$
^Getting class 'Test' from file \.[\\/]Test\.class$
^Getting class 'Test' from file unmarked-overlay[\\/]Test\.class$
^Skipping duplicate definition of class Test not marked with OverlayClassImplementation$
^Adding symbol: field 'x'$
^Adding symbol: method 'java::Test\.main:\(\[Ljava/lang/String;\)V'$
Expand Down
8 changes: 4 additions & 4 deletions jbmc/src/janalyzer/janalyzer_parse_options.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -435,7 +435,7 @@ int janalyzer_parse_optionst::perform_analysis(const optionst &options)
std::ofstream ofs(json_file);
if(!ofs)
{
log.error() << "Failed to open json output `" << json_file << "'"
log.error() << "Failed to open json output '" << json_file << "'"
<< messaget::eom;
return CPROVER_EXIT_INTERNAL_ERROR;
}
Expand All @@ -461,7 +461,7 @@ int janalyzer_parse_optionst::perform_analysis(const optionst &options)
std::ofstream ofs(json_file);
if(!ofs)
{
log.error() << "Failed to open json output `" << json_file << "'"
log.error() << "Failed to open json output '" << json_file << "'"
<< messaget::eom;
return CPROVER_EXIT_INTERNAL_ERROR;
}
Expand All @@ -487,7 +487,7 @@ int janalyzer_parse_optionst::perform_analysis(const optionst &options)
std::ofstream ofs(json_file);
if(!ofs)
{
log.error() << "Failed to open json output `" << json_file << "'"
log.error() << "Failed to open json output '" << json_file << "'"
<< messaget::eom;
return CPROVER_EXIT_INTERNAL_ERROR;
}
Expand Down Expand Up @@ -538,7 +538,7 @@ int janalyzer_parse_optionst::perform_analysis(const optionst &options)

if(!out)
{
log.error() << "Failed to open output file `" << outfile << "'"
log.error() << "Failed to open output file '" << outfile << "'"
<< messaget::eom;
return CPROVER_EXIT_INTERNAL_ERROR;
}
Expand Down
4 changes: 2 additions & 2 deletions jbmc/src/java_bytecode/java_bytecode_parser.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1889,8 +1889,8 @@ java_bytecode_parse(
if(!in)
{
messaget message(message_handler);
message.error() << "failed to open input file `"
<< file << '\'' << messaget::eom;
message.error() << "failed to open input file '" << file << '\''
<< messaget::eom;
return {};
}

Expand Down
11 changes: 5 additions & 6 deletions jbmc/src/java_bytecode/java_class_loader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ java_class_loadert::get_parse_tree(
return parse_trees;

// Not found or failed to load
warning() << "failed to load class `" << class_name << '\'' << eom;
warning() << "failed to load class " << class_name << eom;
parse_trees.emplace_back(class_name);
return parse_trees;
}
Expand Down Expand Up @@ -211,10 +211,10 @@ java_class_loadert::read_jar_file(const std::string &jar_path)
}
catch(const std::runtime_error &)
{
error() << "failed to open JAR file `" << jar_path << "'" << eom;
error() << "failed to open JAR file '" << jar_path << "'" << eom;
return {};
}
debug() << "Adding JAR file `" << jar_path << "'" << eom;
debug() << "Adding JAR file '" << jar_path << "'" << eom;

// Create a new entry in the map and initialize using the list of file names
// that are in jar_filet
Expand All @@ -223,9 +223,8 @@ java_class_loadert::read_jar_file(const std::string &jar_path)
{
if(has_suffix(file_name, ".class"))
{
debug()
<< "Found class file " << file_name << " in JAR `" << jar_path << "'"
<< eom;
debug() << "Found class file " << file_name << " in JAR '" << jar_path
<< "'" << eom;
irep_idt class_name=file_to_class_name(file_name);
classes.push_back(class_name);
}
Expand Down
6 changes: 3 additions & 3 deletions jbmc/src/java_bytecode/java_class_loader_base.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -142,15 +142,15 @@ java_class_loader_baset::get_class_from_jar(
if(!data.has_value())
return {};

debug() << "Getting class `" << class_name << "' from JAR " << jar_file
debug() << "Getting class '" << class_name << "' from JAR " << jar_file
<< eom;

std::istringstream istream(*data);
return java_bytecode_parse(istream, get_message_handler());
}
catch(const std::runtime_error &)
{
error() << "failed to open JAR file `" << jar_file << "'" << eom;
error() << "failed to open JAR file '" << jar_file << "'" << eom;
return {};
}
}
Expand All @@ -170,7 +170,7 @@ java_class_loader_baset::get_class_from_directory(

if(std::ifstream(full_path))
{
debug() << "Getting class `" << class_name << "' from file " << full_path
debug() << "Getting class '" << class_name << "' from file " << full_path
<< eom;
return java_bytecode_parse(full_path, get_message_handler());
}
Expand Down
4 changes: 2 additions & 2 deletions jbmc/src/jbmc/jbmc_parse_options.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -496,7 +496,7 @@ int jbmc_parse_optionst::doit()

if(!infile)
{
log.error() << "failed to open input file `" << filename << "'"
log.error() << "failed to open input file '" << filename << "'"
<< messaget::eom;
return CPROVER_EXIT_INCORRECT_TASK;
}
Expand All @@ -506,7 +506,7 @@ int jbmc_parse_optionst::doit()

if(language==nullptr)
{
log.error() << "failed to figure out type of file `" << filename << "'"
log.error() << "failed to figure out type of file '" << filename << "'"
<< messaget::eom;
return CPROVER_EXIT_INCORRECT_TASK;
}
Expand Down
2 changes: 1 addition & 1 deletion regression/ansi-c/Array_Declarator8/test.desc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ main.c
^EXIT=(64|1)$
^SIGNAL=0$
^CONVERSION ERROR$
array size of static symbol `B' is not constant$
array size of static symbol 'B' is not constant$
--
^warning: ignoring
4 changes: 2 additions & 2 deletions regression/ansi-c/linking_conflicts1/test.desc
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ other.c
^EXIT=(64|1)$
^SIGNAL=0$
^CONVERSION ERROR$
error: conflicting function declarations `bar'
error: conflicting function declarations `bar2'
error: conflicting function declarations 'bar'
error: conflicting function declarations 'bar2'
--
^warning: ignoring
2 changes: 1 addition & 1 deletion regression/ansi-c/linking_conflicts2/test.desc
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@ other.c
^EXIT=(64|1)$
^SIGNAL=0$
^CONVERSION ERROR$
error: conflicting function declarations `foo'
error: conflicting function declarations 'foo'
--
^warning: ignoring
2 changes: 1 addition & 1 deletion regression/ansi-c/message_handling1/test.desc
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ main.c
^EXIT=0$
^SIGNAL=0$
--
encountered goto `bla' that enters one or more lexical blocks
encountered goto 'bla' that enters one or more lexical blocks
2 changes: 1 addition & 1 deletion regression/ansi-c/static2/test.desc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CORE test-c++-front-end
main.c
main2.c --function foo
^main symbol `foo' is ambiguous$
^main symbol 'foo' is ambiguous$
^EXIT=(1|64)$
^SIGNAL=0$
--
Expand Down
2 changes: 1 addition & 1 deletion regression/ansi-c/static3/test.desc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
CORE test-c++-front-end
main.c
main2.c --function foo
^main symbol `foo' is ambiguous$
^main symbol 'foo' is ambiguous$
^EXIT=(1|64)$
^SIGNAL=0$
--
Expand Down
12 changes: 6 additions & 6 deletions regression/cbmc-cover/mcdc1/test.desc
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,12 @@ main.c
--cover mcdc
^EXIT=0$
^SIGNAL=0$
^\[main.coverage.\d+\] file main.c line 14 function main MC/DC independence condition `C && D && !E && A && !B.*: SATISFIED$
^\[main.coverage.\d+\] file main.c line 14 function main MC/DC independence condition `C && !D && E && A && !B.*: SATISFIED$
^\[main.coverage.\d+\] file main.c line 14 function main MC/DC independence condition `!C && D && E && A && !B.*: SATISFIED$
^\[main.coverage.\d+\] file main.c line 14 function main MC/DC independence condition `C && D && E && A && !B.*: SATISFIED$
^\[main.coverage.\d+\] file main.c line 14 function main MC/DC independence condition `C && D && E && !A && B.*: SATISFIED$
^\[main.coverage.\d+\] file main.c line 14 function main MC/DC independence condition `C && D && E && !A && !B.*: SATISFIED$
^\[main.coverage.\d+\] file main.c line 14 function main MC/DC independence condition 'C && D && !E && A && !B.*: SATISFIED$
^\[main.coverage.\d+\] file main.c line 14 function main MC/DC independence condition 'C && !D && E && A && !B.*: SATISFIED$
^\[main.coverage.\d+\] file main.c line 14 function main MC/DC independence condition '!C && D && E && A && !B.*: SATISFIED$
^\[main.coverage.\d+\] file main.c line 14 function main MC/DC independence condition 'C && D && E && A && !B.*: SATISFIED$
^\[main.coverage.\d+\] file main.c line 14 function main MC/DC independence condition 'C && D && E && !A && B.*: SATISFIED$
^\[main.coverage.\d+\] file main.c line 14 function main MC/DC independence condition 'C && D && E && !A && !B.*: SATISFIED$
^\*\* .* of .* covered \(100.0%\)$
--
^warning: ignoring
Loading