summaryrefslogtreecommitdiff
path: root/src/parser.mly
diff options
context:
space:
mode:
authorJon French2018-06-11 13:56:45 +0100
committerJon French2018-06-11 13:56:45 +0100
commit5717bb3d0cef5932cb2b33bc66b3b2f0c0552164 (patch)
treec78330e6cd8622a79ba8ea81d8343bfe44449875 /src/parser.mly
parentb499927e42e60dba6c33c5e445696f5b9daf8c75 (diff)
change double-caret for string-append-pattern to single caret, since that wouldn't be legal in a pattern anyway
Diffstat (limited to 'src/parser.mly')
-rw-r--r--src/parser.mly10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/parser.mly b/src/parser.mly
index 5c513e5b..375eb7d1 100644
--- a/src/parser.mly
+++ b/src/parser.mly
@@ -194,7 +194,7 @@ let rec desugar_rchain chain s e =
%token <string> String Bin Hex Real
%token <string> Amp At Caret Eq Gt Lt Plus Star EqGt Unit
-%token <string> Colon ColonColon CaretCaret TildeTilde ExclEq
+%token <string> Colon ColonColon (* CaretCaret *) TildeTilde ExclEq
%token <string> GtEq
%token <string> LtEq
@@ -668,7 +668,7 @@ typschm_eof:
pat_string_append:
| atomic_pat
{ [$1] }
- | atomic_pat CaretCaret pat_string_append
+ | atomic_pat Caret pat_string_append
{ $1 :: $3 }
pat1:
@@ -678,7 +678,7 @@ pat1:
{ mk_pat (P_vector_concat ($1 :: $3)) $startpos $endpos }
| atomic_pat ColonColon pat1
{ mk_pat (P_cons ($1, $3)) $startpos $endpos }
- | atomic_pat CaretCaret pat_string_append
+ | atomic_pat Caret pat_string_append
{ mk_pat (P_string_append ($1 :: $3)) $startpos $endpos }
pat_concat:
@@ -1223,7 +1223,7 @@ fun_def_list:
mpat_string_append:
| atomic_mpat
{ [$1] }
- | atomic_mpat CaretCaret mpat_string_append
+ | atomic_mpat Caret mpat_string_append
{ $1 :: $3 }
mpat:
@@ -1233,7 +1233,7 @@ mpat:
{ mk_mpat (MP_vector_concat ($1 :: $3)) $startpos $endpos }
| atomic_mpat ColonColon mpat
{ mk_mpat (MP_cons ($1, $3)) $startpos $endpos }
- | atomic_mpat CaretCaret mpat_string_append
+ | atomic_mpat Caret mpat_string_append
{ mk_mpat (MP_string_append ($1 :: $3)) $startpos $endpos }
mpat_concat: