Feature/1001 avoid segfault on empty literal mergestring #1012
Conversation
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
|
Thank you for great contribution and great testcase! |
DarkDimius
reviewed
Jun 23, 2019
ast/desugar/Desugar.cc
Outdated
| @@ -94,7 +94,10 @@ unique_ptr<Expression> mergeStrings(DesugarContext dctx, core::Loc loc, | |||
| loc, | |||
| dctx.ctx.state.enterNameUTF8(fmt::format( | |||
| "{}", fmt::map_join(stringsAccumulated.begin(), stringsAccumulated.end(), "", [&](const auto &expr) { | |||
| return cast_tree<Literal>(expr.get())->asString(dctx.ctx).data(dctx.ctx)->shortName(dctx.ctx); | |||
| if (isa_tree<EmptyTree>(expr.get())) | |||
| return std::basic_string_view(""); | |||
There was a problem hiding this comment.
""sv will make it more readable.
DarkDimius
requested changes
Jun 23, 2019
jez
previously requested changes
Jun 23, 2019
ast/desugar/test/desugar_test.cc
Outdated
| auto ast = sorbet::parser::Parser::run(gs, "<test>", "\"#{}:\""); | ||
| sorbet::core::MutableContext ctx(gs, sorbet::core::Symbols::root()); | ||
| auto o1 = sorbet::ast::desugar::node2Tree(ctx, move(ast)); | ||
| } |
There was a problem hiding this comment.
This test case is redundant with the test/testdata test, and the other one is shorter and easier to grep for.
Do you mind deleting this?
|
@DarkDimius @jez |
DarkDimius
approved these changes
Jun 24, 2019
|
Thank you! Kicking off CI, will merge when it passes! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Motivation
close #1001
Test plan
See included automated tests.