carbon-language/carbon-lang
1
0
Fork 0
mirror of https://github.com/carbon-language/carbon-lang.git synced 2026-10-05 13:31:06 +01:00
Code Issues Packages Projects Releases 10 Wiki Activity

Collapse Sequence into Block. (#927)

Browse Source
This commit is contained in:
Jon Meow
2021-11-01 14:59:39 -07:00
committed by GitHub
parent e69ec3f528
commit 904774fbb8
7 changed files with 60 additions and 131 deletions
Download Patch File Download Diff File Expand all files Collapse all files
executable_semantics/syntax/parser.ypp
+16 -15
View File
@@ -106,8 +106,7 @@
%type <std::pair<Nonnull<Expression*>, bool>> return_expression
%type <Nonnull<Block*>> nonempty_block
%type <Nonnull<Block*>> block
%type <Nonnull<Sequence*>> nonempty_statement_list
%type <std::optional<Nonnull<Sequence*>>> statement_list
%type <std::vector<Nonnull<Statement*>>> statement_list
%type <Nonnull<Expression*>> expression
%type <GenericBinding> generic_binding
%type <std::vector<GenericBinding>> deduced_params
@@ -593,9 +592,8 @@ optional_else:
{ $$ = std::nullopt; }
| ELSE if_statement
{
$$ = arena->New<Block>(
context.source_loc(),
arena->New<Sequence>(context.source_loc(), $2, std::nullopt));
$$ = arena->New<Block>(context.source_loc(),
std::vector<Nonnull<Statement*>>({$2}));
}
| ELSE block
{ $$ = $2; }
@@ -608,21 +606,24 @@ return_expression:
;
statement_list:
// Empty
{ $$ = std::nullopt; }
| nonempty_statement_list
{ $$ = $1; }
;
nonempty_statement_list:
statement statement_list
{ $$ = arena->New<Sequence>(context.source_loc(), $1, $2); }
{ $$ = {}; }
| statement_list statement
{
$$ = std::move($1);
$$.push_back($2);
}
;
block:
LEFT_CURLY_BRACE statement_list RIGHT_CURLY_BRACE
{ $$ = arena->New<Block>(context.source_loc(), $2); }
{ $$ = arena->New<Block>(context.source_loc(), std::move($2)); }
;
nonempty_block:
LEFT_CURLY_BRACE nonempty_statement_list RIGHT_CURLY_BRACE
{ $$ = arena->New<Block>(context.source_loc(), $2); }
LEFT_CURLY_BRACE statement_list statement RIGHT_CURLY_BRACE
{
$2.push_back($3);
$$ = arena->New<Block>(context.source_loc(), std::move($2));
}
;
return_type:
// Empty
{ $$ = {arena->New<TupleLiteral>(context.source_loc()), true}; }