[Pkg-cli-apps-commits] [fsharp] 34/60: Refine parsing priorities for indexer args. (changeset 1310226)

[Christopher Halse Rogers]

This is an automated email from the git hooks/post-receive script.

raof-guest pushed a commit to branch master
in repository fsharp.

commit a834b6bd0edec1453e091b768fa620608cdc21a2
Author: KevinRansom <kevinr at microsoft.com>
Date:   Fri Aug 1 13:38:03 2014 -0700

    Refine parsing priorities for indexer args. (changeset 1310226)
---
 src/fsharp/pars.fsy | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/fsharp/pars.fsy b/src/fsharp/pars.fsy
index 98401c7..0ffdee0 100644
--- a/src/fsharp/pars.fsy
+++ b/src/fsharp/pars.fsy
@@ -440,6 +440,7 @@ let rangeOfLongIdent(lid:LongIdent) =
 %left COMMA
 %nonassoc slice_expr  /* matrix.[e COMMA e] has higher precedence than "e COMMA e" */
 %nonassoc DOT_DOT /* for matrix.[1..2,3..4] the ".." has higher precedence than expression "2 COMMA 3" */
+%nonassoc slice_comma  /* for matrix.[1..2,3..4] the "," has higher precedence than ".." */
 %nonassoc paren_pat_colon
 %nonassoc paren_pat_attribs
 %left OR BAR_BAR JOIN_IN
@@ -3596,8 +3597,8 @@ atomicExprQualification:
         (fun e lhsm dotm -> exprFromParseError (mkSynDotBrackGet lhsm dotm e (arbExpr("indexerExpr2",mArg)))) }
 
 optRangeSeqExpr: 
-  | optRange COMMA optRangeSeqExpr { $1::$3 } 
-  | optRange                       { [$1] }
+  | optRange COMMA optRangeSeqExpr %prec slice_comma { $1::$3 } 
+  | optRange { [$1] }
 
 optRange:
   | declExpr DOT_DOT declExpr 
@@ -4858,4 +4859,4 @@ ends_coming_soon_or_recover:
   | RBRACE_COMING_SOON { false }
   | RPAREN_COMING_SOON { false }
   | OBLOCKEND_COMING_SOON { false }
-  | recover { $1 }
\ No newline at end of file
+  | recover { $1 }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/fsharp.git