Sketch shonky lexing and parsing for and!

TD5 · TD5 · commit dc097e212222 · 2018-09-05T17:04:12.000+01:00
diff --git a/src/fsharp/ast.fs b/src/fsharp/ast.fs
@@ -486,8 +486,8 @@ and
     /// AndBang(isUse, bindings, body, wholeRange)
     ///
     /// F# syntax: and! pat = expr in expr (Must follow on directly from a let! / and!)
-    | AndBang of isUse:bool * bindings:SynBinding list * body:SynAndBangExpr * range:range
-    | EndOfAndBangChain of SynExpr
+    | AndBang of bindSeqPoint:SequencePointInfoForBinding * isUse:bool * isFromSource:bool * SynPat * SynExpr * SynAndBangExpr * range:range
+    | NotAndBang of SynExpr
 and
     [<NoEquality; NoComparison;RequireQualifiedAccess>]
     SynExpr =
diff --git a/src/fsharp/lex.fsl b/src/fsharp/lex.fsl
@@ -243,7 +243,7 @@ rule token args skip = parse
  | ident '!' 
      { let tok = Keywords.KeywordOrIdentifierToken args lexbuf (lexemeTrimRight lexbuf 1) 
        match tok with 
-       | LET _ -> BINDER (lexemeTrimRight lexbuf 1) 
+       | LET _ | AND -> BINDER (lexemeTrimRight lexbuf 1) 
        | _ -> fail args lexbuf (FSComp.SR.lexIdentEndInMarkReserved("!")) (Keywords.KeywordOrIdentifierToken args lexbuf (lexeme lexbuf)) } 
  | ident ('#')  
      { fail args lexbuf (FSComp.SR.lexIdentEndInMarkReserved("#")) (Keywords.KeywordOrIdentifierToken args lexbuf (lexeme lexbuf)) }
diff --git a/src/fsharp/pars.fsy b/src/fsharp/pars.fsy
@@ -3297,20 +3297,26 @@ declExpr:
   | BINDER headBindingPattern EQUALS typedSeqExprBlock IN opt_OBLOCKSEP typedSeqExprBlock %prec expr_let 
      { let spBind = SequencePointAtBinding(rhs2 parseState 1 5)
        let m = unionRanges (rhs parseState 1) $7.Range
-       SynExpr.LetOrUseBang(spBind,($1 = "use"),true,$2,$4,$7,m) }
+       match $1 with
+       | "and" -> SynAndBangExpr.AndBang (spBind,false,true,$2,$4,$7,m)
+       | _ -> SynAndBangExpr.NotAndBang (SynExpr.LetOrUseBang(spBind,($1 = "use"),true,$2,$4,$7,m)) }
 
   | OBINDER headBindingPattern EQUALS typedSeqExprBlock hardwhiteDefnBindingsTerminator opt_OBLOCKSEP typedSeqExprBlock %prec expr_let 
-     { $5 (if $1 = "use" then "use!" else "let!") (rhs parseState 1)  // report unterminated error 
+     { $5 (match $1 with | "use" -> "use!" | "let" -> "let!" | "and" -> "and!") (rhs parseState 1)  // report unterminated error 
        let spBind = SequencePointAtBinding(unionRanges (rhs parseState 1) $4.Range)
        let m = unionRanges (rhs parseState 1) $7.Range
-       SynExpr.LetOrUseBang(spBind,($1 = "use"),true,$2,$4,$7,m) }
+       match $1 with
+       | "and" -> SynAndBangExpr.AndBang (spBind,false,true,$2,$4,$7,m)
+       | _ -> SynAndBangExpr.NotAndBang (SynExpr.LetOrUseBang(spBind,($1 = "use"),true,$2,$4,$7,m)) }
 
   | OBINDER headBindingPattern EQUALS typedSeqExprBlock hardwhiteDefnBindingsTerminator opt_OBLOCKSEP error %prec expr_let 
      { // error recovery that allows intellisense when writing incomplete computation expressions 
        let spBind = SequencePointAtBinding(unionRanges (rhs parseState 1) $4.Range) 
        let mAll = unionRanges (rhs parseState 1) (rhs parseState 7)
        let m = $4.Range.EndRange // zero-width range
-       SynExpr.LetOrUseBang(spBind,($1 = "use"),true,$2,$4, SynExpr.ImplicitZero m, mAll) }
+       match $1 with
+       | "and" -> SynAndBangExpr.AndBang (spBind,false,true,$2,$4, SynExpr.ImplicitZero m, mAll)
+       | _ -> SynAndBangExpr.NotAndBang (SynExpr.LetOrUseBang(spBind,($1 = "use"),true,$2,$4, SynExpr.ImplicitZero m, mAll)) }
 
   | DO_BANG typedSeqExpr IN opt_OBLOCKSEP typedSeqExprBlock %prec expr_let 
      { let spBind = NoSequencePointAtDoBinding
