summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlain Frisch <alain@frisch.fr>2014-04-30 08:05:52 +0000
committerAlain Frisch <alain@frisch.fr>2014-04-30 08:05:52 +0000
commit772a84381271f12426d5010be27c6f4bf6263b05 (patch)
tree553b2505a9cbf19ecfb7cb90cc4d186f178d3c71
parent676497f8cfce471771ae16b54c28ff30c980c424 (diff)
Fix precedence of extension nodes (#6386).
git-svn-id: http://caml.inria.fr/svn/ocaml/trunk@14711 f963ae5c-01c2-4b8c-9fe0-0dff7051ff02
-rw-r--r--parsing/parser.mly4
1 files changed, 1 insertions, 3 deletions
diff --git a/parsing/parser.mly b/parsing/parser.mly
index 71ab694eb..f92048f9c 100644
--- a/parsing/parser.mly
+++ b/parsing/parser.mly
@@ -453,8 +453,6 @@ The precedences must be listed from low to high.
%nonassoc below_LBRACKETAT
%nonassoc LBRACKETAT
%nonassoc LBRACKETATAT
-%nonassoc LBRACKETPERCENT
-%nonassoc LBRACKETPERCENTPERCENT
%right COLONCOLON /* expr (e :: e :: e) */
%left INFIXOP2 PLUS PLUSDOT MINUS MINUSDOT /* expr (e OP e OP e) */
%left PERCENT INFIXOP3 STAR /* expr (e OP e OP e) */
@@ -470,7 +468,7 @@ The precedences must be listed from low to high.
%nonassoc BACKQUOTE BANG BEGIN CHAR FALSE FLOAT INT INT32 INT64
LBRACE LBRACELESS LBRACKET LBRACKETBAR LIDENT LPAREN
NEW NATIVEINT PREFIXOP STRING TRUE UIDENT
- /*LBRACKETPERCENT LBRACKETPERCENTPERCENT*/
+ LBRACKETPERCENT LBRACKETPERCENTPERCENT
/* Entry points */