max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-12 17:26:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

parser.y: eliminate conflicts

Browse source
This commit is contained in:
Ryan Hendrickson 2024-07-20 12:04:25 -04:00
parent b0a8430e85
commit 6e3b9e6a4d
2 changed files with 39 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
src/libexpr/parser.y
View file

@ -8,8 +8,8 @@
%parse-param { nix::ParserState * state } %parse-param { nix::ParserState * state }
%lex-param { void * scanner } %lex-param { void * scanner }
%lex-param { nix::ParserState * state } %lex-param { nix::ParserState * state }
%expect 1 %expect 0
%expect-rr 1 %expect-rr 0
%code requires { %code requires {
@ -133,8 +133,8 @@ static Expr * makeCall(PosIdx pos, Expr * fn, Expr * arg) {
%type <e> expr_select expr_simple expr_app %type <e> expr_select expr_simple expr_app
%type <e> expr_pipe_from expr_pipe_into %type <e> expr_pipe_from expr_pipe_into
%type <list> expr_list %type <list> expr_list
%type <attrs> binds %type <attrs> binds binds1
%type <formals> formals %type <formals> formals formal_set
%type <formal> formal %type <formal> formal
%type <attrNames> attrpath %type <attrNames> attrpath
%type <inheritAttrs> attrs %type <inheritAttrs> attrs
@ -180,22 +180,22 @@ expr_function
$$ = me; $$ = me;
SET_DOC_POS(me, @1); SET_DOC_POS(me, @1);
} }
| '{' formals '}' ':' expr_function[body] | formal_set ':' expr_function[body]
{ auto me = new ExprLambda(CUR_POS, state->validateFormals($formals), $body); { auto me = new ExprLambda(CUR_POS, state->validateFormals($formal_set), $body);
$$ = me; $$ = me;
SET_DOC_POS(me, @1); SET_DOC_POS(me, @1);
} }
| '{' formals '}' '@' ID ':' expr_function[body] | formal_set '@' ID ':' expr_function[body]
{ {
auto arg = state->symbols.create($ID); auto arg = state->symbols.create($ID);
auto me = new ExprLambda(CUR_POS, arg, state->validateFormals($formals, CUR_POS, arg), $body); auto me = new ExprLambda(CUR_POS, arg, state->validateFormals($formal_set, CUR_POS, arg), $body);
$$ = me; $$ = me;
SET_DOC_POS(me, @1); SET_DOC_POS(me, @1);
} }
| ID '@' '{' formals '}' ':' expr_function[body] | ID '@' formal_set ':' expr_function[body]
{ {
auto arg = state->symbols.create($ID); auto arg = state->symbols.create($ID);
auto me = new ExprLambda(CUR_POS, arg, state->validateFormals($formals, CUR_POS, arg), $body); auto me = new ExprLambda(CUR_POS, arg, state->validateFormals($formal_set, CUR_POS, arg), $body);
$$ = me; $$ = me;
SET_DOC_POS(me, @1); SET_DOC_POS(me, @1);
} }
@ -311,11 +311,13 @@ expr_simple
/* Let expressions `let {..., body = ...}' are just desugared /* Let expressions `let {..., body = ...}' are just desugared
into `(rec {..., body = ...}).body'. */ into `(rec {..., body = ...}).body'. */
| LET '{' binds '}' | LET '{' binds '}'
{ $3->recursive = true; $$ = new ExprSelect(noPos, $3, state->s.body); } { $3->recursive = true; $3->pos = CUR_POS; $$ = new ExprSelect(noPos, $3, state->s.body); }
| REC '{' binds '}' | REC '{' binds '}'
{ $3->recursive = true; $$ = $3; } { $3->recursive = true; $3->pos = CUR_POS; $$ = $3; }
| '{' binds '}' | '{' binds1 '}'
{ $$ = $2; } { $2->pos = CUR_POS; $$ = $2; }
| '{' '}'
{ $$ = new ExprAttrs(CUR_POS); }
| '[' expr_list ']' { $$ = $2; } | '[' expr_list ']' { $$ = $2; }
; ;
@ -364,8 +366,13 @@ ind_string_parts
; ;
binds binds
: binds[accum] attrpath '=' expr ';' { : binds1
$$ = $accum; | { $$ = new ExprAttrs; }
;
binds1
: binds1[accum] attrpath '=' expr ';'
{ $$ = $accum;
state->addAttr($$, std::move(*$attrpath), @attrpath, $expr, @expr); state->addAttr($$, std::move(*$attrpath), @attrpath, $expr, @expr);
delete $attrpath; delete $attrpath;
} }
@ -398,7 +405,11 @@ binds
} }
delete $attrs; delete $attrs;
} }
| { $$ = new ExprAttrs(state->at(@0)); } | attrpath '=' expr ';'
{ $$ = new ExprAttrs;
state->addAttr($$, std::move(*$attrpath), @attrpath, $expr, @expr);
delete $attrpath;
}
; ;
attrs attrs
@ -456,15 +467,19 @@ expr_list
| { $$ = new ExprList; } | { $$ = new ExprList; }
; ;
formal_set
: '{' formals ',' ELLIPSIS '}' { $$ = $formals; $$->ellipsis = true; }
| '{' ELLIPSIS '}' { $$ = new Formals; $$->ellipsis = true; }
| '{' formals ',' '}' { $$ = $formals; $$->ellipsis = false; }
| '{' formals '}' { $$ = $formals; $$->ellipsis = false; }
| '{' '}' { $$ = new Formals; $$->ellipsis = false; }
;
formals formals
: formal ',' formals[accum] : formals[accum] ',' formal
{ $$ = $accum; $$->formals.emplace_back(*$formal); delete $formal; } { $$ = $accum; $$->formals.emplace_back(*$formal); delete $formal; }
| formal | formal
{ $$ = new Formals; $$->formals.emplace_back(*$formal); $$->ellipsis = false; delete $formal; } { $$ = new Formals; $$->formals.emplace_back(*$formal); delete $formal; }
|
{ $$ = new Formals; $$->ellipsis = false; }
| ELLIPSIS
{ $$ = new Formals; $$->ellipsis = true; }
; ;
formal formal

2
tests/functional/lang/parse-fail-undef-var-2.err.exp
View file

@ -1,4 +1,4 @@
error: syntax error, unexpected ':', expecting '}' error: syntax error, unexpected ':', expecting '}' or ','
at «stdin»:3:13: at «stdin»:3:13:
2| 2|
3| f = {x, y : ["baz" "bar" z "bat"]}: x + y; 3| f = {x, y : ["baz" "bar" z "bat"]}: x + y;