-
Notifications
You must be signed in to change notification settings - Fork 15
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
#988: Improved error message from CTPG parser. #466
Merged
tomuben
merged 1 commit into
master
from
bug/988_improve_error_message_from_ctpg_parser
Oct 22, 2024
+33
−6
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 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 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 |
---|---|---|
|
@@ -84,7 +84,27 @@ TEST(ScriptOptionLinesTest, need_option_termination_character) { | |
catch( const OptionParserException& e ) | ||
{ | ||
// and this tests that it has the correct message | ||
EXPECT_STREQ( e.what(), "Error parsing script options: [1:17] PARSE: Syntax error: Unexpected '<eof>'\n"); | ||
EXPECT_STREQ( e.what(), "Error parsing script options at line 0: [1:17] PARSE: Syntax error: Unexpected '<eof>'\n"); | ||
throw; | ||
} | ||
}, OptionParserException ); | ||
} | ||
|
||
TEST(ScriptOptionLinesTest, need_option_termination_character_second_line) { | ||
const std::string code = | ||
"%optionA myoption;\n" | ||
"%optionB myoption\n" | ||
"\nmycode"; | ||
options_map_t result; | ||
EXPECT_THROW({ | ||
try | ||
{ | ||
parseOptions(code, result); | ||
} | ||
catch( const OptionParserException& e ) | ||
{ | ||
// and this tests that it has the correct message | ||
EXPECT_STREQ( e.what(), "Error parsing script options at line 1: [1:18] PARSE: Syntax error: Unexpected '<eof>'\n"); | ||
throw; | ||
} | ||
Comment on lines
+93
to
109
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I would consider spliting the test into two test.
|
||
}, OptionParserException ); | ||
|
Oops, something went wrong.
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 was actually a bug.
It's std::string::subst(begin, length), not std::string::subst(begin, end)
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.
does this change something on the performance?
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.
Here results of our performance tests:
Master branch: 6.9s
This branch: 7.0s