summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJacques Garrigue <garrigue at math.nagoya-u.ac.jp>1999-12-06 17:16:59 +0000
committerJacques Garrigue <garrigue at math.nagoya-u.ac.jp>1999-12-06 17:16:59 +0000
commit79850cc58538d21863de972e7843d77d7dedd031 (patch)
tree702c5dd4eb1eba9afb89171c210e399bf16fc470
parent221224ae94ed0da04e0d98a99415f0db38273d4d (diff)
elimine le conflit reduce/reduce sur []
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@2672 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--parsing/parser.mly2
1 files changed, 1 insertions, 1 deletions
diff --git a/parsing/parser.mly b/parsing/parser.mly
index d069f2158..35a8fdb6a 100644
--- a/parsing/parser.mly
+++ b/parsing/parser.mly
@@ -1309,7 +1309,7 @@ operator:
;
constr_ident:
UIDENT { $1 }
- | LBRACKET RBRACKET { "[]" }
+/* | LBRACKET RBRACKET { "[]" } */
| LPAREN RPAREN { "()" }
| COLONCOLON { "::" }
| FALSE { "false" }