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-10-26T17·01+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2004-10-26T17·01+0000
commit9fa07b376dd52ee8bbcc074e59d36af3f3f2536d (patch)
treeef2d6d8d32b8a7c87c5396ab3b34b7fafa3810f1 /src/libexpr/parser.y
parentee401afad81dc7759c66829372826f98268ae606 (diff)
* String/path concatenation operator (`+').
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 88ee8326b8d3..c56d89809f49 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -53,6 +53,7 @@ ATerm makePos(YYLTYPE * loc, void * data)
 %nonassoc EQ NEQ
 %right UPDATE
 %left NEG
+%left '+'
 %nonassoc '?'
 %nonassoc '~'
 
@@ -90,6 +91,7 @@ expr_op
   | expr_op UPDATE expr_op { $$ = ATmake("OpUpdate(<term>, <term>)", $1, $3); }
   | expr_op '~' expr_op { $$ = ATmake("SubPath(<term>, <term>)", $1, $3); }
   | expr_op '?' ID { $$ = ATmake("OpHasAttr(<term>, <term>)", $1, $3); }
+  | expr_op '+' expr_op { $$ = ATmake("OpPlus(<term>, <term>)", $1, $3); }
   | expr_app
   ;