aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2010-04-01 16:59:07 +0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2010-04-01 16:59:07 +0000
commita5ece7d016e72a61ca69a401e833314f538518f9 (patch)
treedb4e8dc521a7f794009c39b1338bc931dfee487a /src
parentc172274e170a87a30420842ee07ed1f7226d7f2e (diff)
* Removed the `~' operator.
Diffstat (limited to 'src')
-rw-r--r--src/libexpr/nixexpr-ast.def1
-rw-r--r--src/libexpr/parser.y1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/libexpr/nixexpr-ast.def b/src/libexpr/nixexpr-ast.def
index b34466543..36c25dcfe 100644
--- a/src/libexpr/nixexpr-ast.def
+++ b/src/libexpr/nixexpr-ast.def
@@ -14,7 +14,6 @@ OpAnd | Expr Expr | Expr |
OpOr | Expr Expr | Expr |
OpImpl | Expr Expr | Expr |
OpUpdate | Expr Expr | Expr |
-SubPath | Expr Expr | Expr |
OpHasAttr | Expr string | Expr |
OpPlus | Expr Expr | Expr |
OpConcat | Expr Expr | Expr |
diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y
index 3a56c2627..3463a5c5d 100644
--- a/src/libexpr/parser.y
+++ b/src/libexpr/parser.y
@@ -373,7 +373,6 @@ expr_op
| expr_op OR expr_op { $$ = makeOpOr($1, $3); }
| expr_op IMPL expr_op { $$ = makeOpImpl($1, $3); }
| expr_op UPDATE expr_op { $$ = makeOpUpdate($1, $3); }
- | expr_op '~' expr_op { $$ = makeSubPath($1, $3); }
| expr_op '?' ID { $$ = makeOpHasAttr($1, $3); }
| expr_op '+' expr_op { $$ = makeConcatStrings(ATmakeList2($1, $3)); }
| expr_op CONCAT expr_op { $$ = makeOpConcat($1, $3); }