-
Notifications
You must be signed in to change notification settings - Fork 273
Call get_language_options
on --show-parse-tree
#1113
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
mgudemann
merged 1 commit into
diffblue:test-gen-support
from
mgudemann:fix/language_set_options_show_parse_tree
Jul 11, 2017
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -14,6 +14,7 @@ Author: Daniel Kroening, [email protected] | |
#include <util/config.h> | ||
#include <util/cmdline.h> | ||
#include <util/string2int.h> | ||
#include <util/invariant.h> | ||
#include <json/json_parser.h> | ||
|
||
#include <goto-programs/class_hierarchy.h> | ||
|
@@ -79,6 +80,8 @@ void java_bytecode_languaget::get_language_options(const cmdlinet &cmd) | |
} | ||
else | ||
java_cp_include_files=".*"; | ||
|
||
language_options_initialized=true; | ||
} | ||
|
||
std::set<std::string> java_bytecode_languaget::extensions() const | ||
|
@@ -105,6 +108,7 @@ bool java_bytecode_languaget::parse( | |
std::istream &instream, | ||
const std::string &path) | ||
{ | ||
PRECONDITION(language_options_initialized); | ||
java_class_loader.set_message_handler(get_message_handler()); | ||
java_class_loader.set_java_cp_include_files(java_cp_include_files); | ||
|
||
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is potentially also missing from
clobber_parse_options.cpp
and possibly other places (by looking for references toget_language_from_filename
andget_language_from_mode
). Is there a way we can make this less error prone, or at least add a clear error message ifget_language_options
hasn't been called for an instance oflanguage
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
okk, I added it to
clobber...cpp
too, I also changed the exception message to include that maybeget_language_options
was not called