diff options
| -rw-r--r-- | src/libexpr/parser.cc | 15 | ||||
| -rw-r--r-- | src/libexpr/parser.y | 11 |
2 files changed, 18 insertions, 8 deletions
diff --git a/src/libexpr/parser.cc b/src/libexpr/parser.cc index 68b367340acf..c300a0d07bc4 100644 --- a/src/libexpr/parser.cc +++ b/src/libexpr/parser.cc @@ -50,11 +50,16 @@ ATerm fixAttrs(int recursive, ATermList as) ATermList * is = recursive ? &cs : &bs; for (ATermIterator i(as); i; ++i) { ATermList names; - if (atMatch(m, *i) >> "Inherit" >> names) - for (ATermIterator j(names); j; ++j) - *is = ATinsert(*is, - ATmake("Bind(<term>, Var(<term>))", *j, *j)); - else bs = ATinsert(bs, *i); + Expr src; + if (atMatch(m, *i) >> "Inherit" >> src >> names) { + bool fromScope = atMatch(m, src) >> "Scope"; + for (ATermIterator j(names); j; ++j) { + Expr rhs = fromScope + ? ATmake("Var(<term>)", *j) + : ATmake("Select(<term>, <term>)", src, *j); + *is = ATinsert(*is, ATmake("Bind(<term>, <term>)", *j, rhs)); + } + } else bs = ATinsert(bs, *i); } if (recursive) return ATmake("Rec(<term>, <term>)", bs, cs); diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index 6c0fdbda25f3..257c0cd38ab2 100644 --- a/src/libexpr/parser.y +++ b/src/libexpr/parser.y @@ -33,7 +33,7 @@ void yyerror(YYLTYPE * loc, yyscan_t scanner, void * data, char * s) } %type <t> start expr expr_function expr_assert expr_op -%type <t> expr_app expr_select expr_simple bind formal +%type <t> expr_app expr_select expr_simple bind inheritsrc formal %type <ts> binds ids expr_list formals %token <t> ID INT STR PATH URI %token IF THEN ELSE ASSERT LET REC INHERIT EQ NEQ AND OR IMPL @@ -114,8 +114,13 @@ binds bind : ID '=' expr ';' { $$ = ATmake("Bind(<term>, <term>)", $1, $3); } - | INHERIT ids ';' - { $$ = ATmake("Inherit(<term>)", $2); } + | INHERIT inheritsrc ids ';' + { $$ = ATmake("Inherit(<term>, <term>)", $2, $3); } + ; + +inheritsrc + : '(' expr ')' { $$ = $2; } + | { $$ = ATmake("Scope"); } ; ids: ids ID { $$ = ATinsert($1, $2); } | { $$ = ATempty; }; |