diff options
| -rw-r--r-- | parsing/lexer.mll | 2 | ||||
| -rw-r--r-- | parsing/parser.mly | 4 | ||||
| -rw-r--r-- | utils/config.mlp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/parsing/lexer.mll b/parsing/lexer.mll index 24e59e121..e545525b9 100644 --- a/parsing/lexer.mll +++ b/parsing/lexer.mll @@ -272,10 +272,10 @@ rule token = parse | "=" { EQUAL } | "[" { LBRACKET } | "[|" { LBRACKETBAR } + | "[=" { LBRACKETEQUAL } | "[<" { LBRACKETLESS } | "]" { RBRACKET } | "{" { LBRACE } - | "{=" { LBRACEEQUAL } | "{<" { LBRACELESS } | "|" { BAR } | "||" { BARBAR } diff --git a/parsing/parser.mly b/parsing/parser.mly index 35a8fdb6a..8e999c76e 100644 --- a/parsing/parser.mly +++ b/parsing/parser.mly @@ -209,10 +209,10 @@ let unclosed opening_name opening_num closing_name closing_num = %token <string> LABELID %token LAZY %token LBRACE -%token LBRACEEQUAL %token LBRACELESS %token LBRACKET %token LBRACKETBAR +%token LBRACKETEQUAL %token LBRACKETLESS %token LESS %token LESSMINUS @@ -665,7 +665,7 @@ seq_expr: | expr SEMI seq_expr { mkexp(Pexp_sequence($1, $3)) } ; labeled_simple_pattern: - QUESTION label_pattern LBRACEEQUAL seq_expr RBRACE + QUESTION label_pattern LBRACKETEQUAL seq_expr RBRACKET { ("?" ^ fst $2, Some $4, snd $2) } | QUESTION label_pattern { ("?" ^ fst $2, None, snd $2) } diff --git a/utils/config.mlp b/utils/config.mlp index c990c5ce0..51170649f 100644 --- a/utils/config.mlp +++ b/utils/config.mlp @@ -12,7 +12,7 @@ (* $Id$ *) -let version = "2.99 (99/12/06)" +let version = "2.99 (99/12/07)" let standard_library = try |