Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Parse dict literal keys as expressions #245

Closed
wants to merge 1 commit into from
Closed

Parse dict literal keys as expressions #245

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion src/expression_evaluator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ InternalValue DictCreator::Evaluate(RenderContext& context)
InternalValueMap result;
for (auto& e : m_exprs)
{
result[e.first] = e.second->Evaluate(context);
auto key = e.first->Evaluate(context);
result[AsString(key)] = e.second->Evaluate(context);
}

return CreateMapAdapter(std::move(result));;
Expand Down
4 changes: 2 additions & 2 deletions src/expression_evaluator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -348,7 +348,7 @@ class DictionaryCreator : public Expression
class DictCreator : public Expression
{
public:
DictCreator(std::unordered_map<std::string, ExpressionEvaluatorPtr<>> exprs)
DictCreator(std::vector<std::pair<ExpressionEvaluatorPtr<>, ExpressionEvaluatorPtr<>>> exprs)
: m_exprs(std::move(exprs))
{
}
Expand All @@ -363,7 +363,7 @@ class DictCreator : public Expression
return m_exprs == val->m_exprs;
}
private:
std::unordered_map<std::string, ExpressionEvaluatorPtr<>> m_exprs;
std::vector<std::pair<ExpressionEvaluatorPtr<>, ExpressionEvaluatorPtr<>>> m_exprs;
};

class UnaryExpression : public Expression
Expand Down
24 changes: 12 additions & 12 deletions src/expression_parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -369,31 +369,31 @@ ExpressionParser::ParseResult<ExpressionEvaluatorPtr<Expression>> ExpressionPars
{
ExpressionEvaluatorPtr<Expression> result;

std::unordered_map<std::string, ExpressionEvaluatorPtr<Expression>> items;
std::vector<std::pair<ExpressionEvaluatorPtr<Expression>, ExpressionEvaluatorPtr<Expression>>> items;
if (lexer.EatIfEqual('}'))
return std::make_shared<DictCreator>(std::move(items));

do
{
Token key = lexer.NextToken();
if (key != Token::String)
return MakeParseError(ErrorCode::ExpectedStringLiteral, key);
auto pivotTok = lexer.PeekNextToken();
auto key = ParseFullExpression(lexer);
if (!key)
return ReplaceErrorIfPossible(key, pivotTok, ErrorCode::ExpectedExpression);

if (!lexer.EatIfEqual('='))
if (!lexer.EatIfEqual('=') && !lexer.EatIfEqual(':'))
{
auto tok = lexer.PeekNextToken();
auto tok1 = tok;
tok1.type = Token::Assign;
tok1.type = Token::Colon;
return MakeParseError(ErrorCode::ExpectedToken, tok, {tok1});
}

auto pivotTok = lexer.PeekNextToken();
auto expr = ParseFullExpression(lexer);
if (!expr)
return ReplaceErrorIfPossible(expr, pivotTok, ErrorCode::ExpectedExpression);

items[AsString(key.value)] = *expr;
pivotTok = lexer.PeekNextToken();
auto value = ParseFullExpression(lexer);
if (!value)
return ReplaceErrorIfPossible(value, pivotTok, ErrorCode::ExpectedExpression);

items.emplace_back(*key, *value);
} while (lexer.EatIfEqual(','));

auto tok = lexer.NextToken();
Expand Down
1 change: 1 addition & 0 deletions src/lexer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ struct Token
LCrlBracket = '{',
RCrlBracket = '}',
Assign = '=',
Colon = ':',
Comma = ',',
Eof = 256,

Expand Down
1 change: 1 addition & 0 deletions src/template_parser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1016,6 +1016,7 @@ std::unordered_map<int, MultiStringLiteral> ParserTraitsBase<T>::s_tokens = {
{ Token::LCrlBracket, UNIVERSAL_STR("{") },
{ Token::RCrlBracket, UNIVERSAL_STR("}") },
{ Token::Assign, UNIVERSAL_STR("=") },
{ Token::Colon, UNIVERSAL_STR(":") },
{ Token::Comma, UNIVERSAL_STR(",") },
{ Token::Eof, UNIVERSAL_STR("<<End of block>>") },
{ Token::Equal, UNIVERSAL_STR("==") },
Expand Down
14 changes: 7 additions & 7 deletions test/errors_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,27 +300,27 @@ INSTANTIATE_TEST_SUITE_P(BasicExpressionsTest, ErrorsGenericTest, ::testing::Val
InputOutputPair{"{{ 1 if 2 is 3 else 2 }}",
"noname.j2tpl:1:14: error: Identifier expected\n{{ 1 if 2 is 3 else 2 }}\n ---^-------"},
InputOutputPair{"{{ 1 if 2 == 3 else {1} }}",
"noname.j2tpl:1:22: error: String expected\n{{ 1 if 2 == 3 else {1} }}\n ---^-------"},
"noname.j2tpl:1:23: error: Unexpected token '}'. Expected: ':'\n{{ 1 if 2 == 3 else {1} }}\n ---^-------"},
InputOutputPair{"{{ 1 if 2 is equalto(10,) else 2 }}",
"noname.j2tpl:1:25: error: Unexpected token: ')'\n{{ 1 if 2 is equalto(10,) else 2 }}\n ---^-------"},
InputOutputPair{"{{ range(1, 3, ) }}",
"noname.j2tpl:1:16: error: Unexpected token: ')'\n{{ range(1, 3, ) }}\n ---^-------"},
InputOutputPair{"{{ range(1, 3} }}",
"noname.j2tpl:1:14: error: ')' expected\n{{ range(1, 3} }}\n ---^-------"},
InputOutputPair{"{{ {1, 3, 5] }}",
"noname.j2tpl:1:5: error: String expected\n{{ {1, 3, 5] }}\n ---^-------"},
"noname.j2tpl:1:6: error: Unexpected token ','. Expected: ':'\n{{ {1, 3, 5] }}\n ---^-------"},
InputOutputPair{"{{ {'key'} }}",
"noname.j2tpl:1:10: error: Unexpected token '}'. Expected: '='\n{{ {'key'} }}\n ---^-------"},
"noname.j2tpl:1:10: error: Unexpected token '}'. Expected: ':'\n{{ {'key'} }}\n ---^-------"},
InputOutputPair{"{{ {'key'=} }}",
"noname.j2tpl:1:11: error: Expected expression, got: '}'\n{{ {'key'=} }}\n ---^-------"},
InputOutputPair{"{{ {'key'=,} }}",
"noname.j2tpl:1:11: error: Expected expression, got: ','\n{{ {'key'=,} }}\n ---^-------"},
InputOutputPair{"{{ {=1} }}",
"noname.j2tpl:1:5: error: String expected\n{{ {=1} }}\n ---^-------"},
"noname.j2tpl:1:5: error: Expected expression, got: '='\n{{ {=1} }}\n ---^-------"},
InputOutputPair{"{{ {'key'=1] }}",
"noname.j2tpl:1:12: error: '}' expected\n{{ {'key'=1] }}\n ---^-------"},
InputOutputPair{"{{ {'key'=1,} }}",
"noname.j2tpl:1:13: error: String expected\n{{ {'key'=1,} }}\n ---^-------"},
"noname.j2tpl:1:13: error: Expected expression, got: '}'\n{{ {'key'=1,} }}\n ---^-------"},
InputOutputPair{"{{ [1, 3, 5} }}",
"noname.j2tpl:1:12: error: ']' expected\n{{ [1, 3, 5} }}\n ---^-------"},
InputOutputPair{"{{ [1, 3,] }}",
Expand Down Expand Up @@ -369,7 +369,7 @@ INSTANTIATE_TEST_SUITE_P(StatementsTest_1, ErrorsGenericTest, ::testing::Values(
InputOutputPair{"{% for i in range(10) endfor%}",
"noname.j2tpl:1:23: error: Unexpected token 'endfor'. Expected: 'if', 'recursive', '<<End of block>>'\n{% for i in range(10) endfor%}\n ---^-------"},
InputOutputPair{"{% for i in range(10) if {key} %}",
"noname.j2tpl:1:27: error: String expected\n{% for i in range(10) if {key} %}\n ---^-------"},
"noname.j2tpl:1:30: error: Unexpected token '}'. Expected: ':'\n{% for i in range(10) if {key} %}\n ---^-------"},
InputOutputPair{"{% for i in range(10) if true else hello %}",
"noname.j2tpl:1:31: error: Expected end of statement, got: 'else'\n{% for i in range(10) if true else hello %}\n ---^-------"},
InputOutputPair{"{% for i in range(10) %}\n{% endif %}",
Expand All @@ -383,7 +383,7 @@ INSTANTIATE_TEST_SUITE_P(StatementsTest_1, ErrorsGenericTest, ::testing::Values(
InputOutputPair{"{% set 10%}",
"noname.j2tpl:1:8: error: Identifier expected\n{% set 10%}\n ---^-------"},
InputOutputPair{"{% set i = {key] %}",
"noname.j2tpl:1:13: error: String expected\n{% set i = {key] %}\n ---^-------"},
"noname.j2tpl:1:16: error: Unexpected token ']'. Expected: ':'\n{% set i = {key] %}\n ---^-------"},
InputOutputPair{"{% set id=10%}\n{% endset %}",
"noname.j2tpl:2:4: error: Unexpected statement: 'endset'\n{% endset %}\n---^-------"},
InputOutputPair{"{% extends %}",
Expand Down
2 changes: 2 additions & 0 deletions test/expressions_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,8 @@ INSTANTIATE_TEST_SUITE_P(ComplexSubscriptionTest, ExpressionSubstitutionTest, ::
InputOutputPair{"mapValue.reflectedList[1]['intValue']", "1"},
InputOutputPair{"mapValue['reflectedList'][1]['intValue']", "1"},
InputOutputPair{"mapValue.reflectedList[1].intValue", "1"},
InputOutputPair{"{'fieldName':'field', 'fieldValue':10}.fieldName", "field"},
InputOutputPair{"{stringValue:'field'}.rain", "field"},
InputOutputPair{"{'fieldName'='field', 'fieldValue'=10}.fieldName", "field"},
InputOutputPair{"{'fieldName'='field', 'fieldValue'=10}['fieldValue']", "10"},
InputOutputPair{R"( ([
Expand Down