about summary refs log tree commit diff
path: root/src/libexpr/parser.y
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2004-02-04T16·49+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2004-02-04T16·49+0000
commit9d25466b34a5f7c1c8b1c273976cf59c33961a6c (patch)
treeee4a5a60ae5de90fb301d75258ea627300065b2a /src/libexpr/parser.y
parent6d46e647ba16e19100dcd0abda9ca5a81ccf764f (diff)
* An attribute set update operator (//). E.g.,
  {x=1; y=2; z=3;} // {y=4;}  =>  {x=1; y=4; z=3;}

Diffstat (limited to 'src/libexpr/parser.y')
-rw-r--r--src/libexpr/parser.y2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index d97106fcae..6c0fdbda25 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -42,6 +42,7 @@ void yyerror(YYLTYPE * loc, yyscan_t scanner, void * data, char * s)
 %left OR
 %left AND
 %nonassoc EQ NEQ
+%right UPDATE
 %left NEG
 
 %%
@@ -69,6 +70,7 @@ expr_op
   | expr_op AND expr_op { $$ = ATmake("OpAnd(<term>, <term>)", $1, $3); }
   | expr_op OR expr_op { $$ = ATmake("OpOr(<term>, <term>)", $1, $3); }
   | expr_op IMPL expr_op { $$ = ATmake("OpImpl(<term>, <term>)", $1, $3); }
+  | expr_op UPDATE expr_op { $$ = ATmake("OpUpdate(<term>, <term>)", $1, $3); }
   | expr_app
   ;