Remove or $, fix tests

Author: kerams

src/Compiler/Checking/Expressions/CheckExpressions.fs

@@ -3789,14 +3789,12 @@ let buildApp (cenv: cenv) expr resultTy arg m =
 
     // Special rule for building applications of the 'x && y' operator
     | ApplicableExpr(expr=Expr.App (Expr.Val (vref, _, _), _, _, [x0], _)), _
-         when valRefEq g vref g.and_vref
-           || valRefEq g vref g.and2_vref ->
+         when valRefEq g vref g.and2_vref ->
         MakeApplicableExprNoFlex cenv (mkLazyAnd g m x0 arg), resultTy
 
     // Special rule for building applications of the 'x || y' operator
     | ApplicableExpr(expr=Expr.App (Expr.Val (vref, _, _), _, _, [x0], _)), _
-         when valRefEq g vref g.or_vref
-           || valRefEq g vref g.or2_vref ->
+         when valRefEq g vref g.or2_vref ->
         MakeApplicableExprNoFlex cenv (mkLazyOr g m x0 arg ), resultTy
 
     // Special rule for building applications of the 'reraise' operator
@@ -8608,9 +8606,7 @@ and TcApplicationThen (cenv: cenv) (overallTy: OverallTy) env tpenv mExprAndArg
                     match leftExpr with
                     | ApplicableExpr(expr=Expr.Val (vref, _, _))
                     | ApplicableExpr(expr=Expr.App (Expr.Val (vref, _, _), _, _, [_], _))
-                         when valRefEq g vref g.and_vref
-                           || valRefEq g vref g.and2_vref
-                           || valRefEq g vref g.or_vref
+                         when valRefEq g vref g.and2_vref
                            || valRefEq g vref g.or2_vref -> { env with eIsControlFlow = true }
                     | _ -> env
 

src/Compiler/FSComp.txt

@@ -391,7 +391,6 @@ csOverloadCandidateIndexedArgumentTypeMismatch,"Argument at index %d doesn't mat
 516,parsEofInComment,"End of file in comment begun at or before here"
 517,parsEofInStringInComment,"End of file in string embedded in comment begun at or before here"
 518,parsEofInVerbatimStringInComment,"End of file in verbatim string embedded in comment begun at or before here"
-519,parsEofInIfOcaml,"End of file in IF-OCAML section begun at or before here"
 520,parsEofInDirective,"End of file in directive begun at or before here"
 521,parsNoHashEndIfFound,"No #endif found for #if or #else"
 522,parsAttributesIgnored,"Attributes have been ignored in this construct"
@@ -1445,7 +1444,7 @@ keywordDescriptionNot,"Not actually a keyword. However, not struct in combinatio
 keywordDescriptionNull,"Indicates the absence of an object. Also used in generic parameter constraints."
 keywordDescriptionOf,"Used in discriminated unions to indicate the type of categories of values, and in delegate and exception declarations."
 keywordDescriptionOpen,"Used to make the contents of a namespace or module available without qualification."
-keywordDescriptionOr,"Used with Boolean conditions as a Boolean or operator. Equivalent to ||. Also used in member constraints."
+keywordDescriptionOr,"Used in member constraints."
 keywordDescriptionOverride,"Used to implement a version of an abstract or virtual method that differs from the base version."
 keywordDescriptionPrivate,"Restricts access to a member to code in the same type or module."
 keywordDescriptionPublic,"Allows access to a member from outside the type."

src/Compiler/Service/ServiceLexing.fs

@@ -466,7 +466,6 @@ type FSharpTokenizerColorState =
     | Comment = 5
     | StringInComment = 6
     | VerbatimStringInComment = 7
-    | CamlOnly = 8
     | VerbatimString = 9
     | SingleLineComment = 10
     | EndLineThenSkip = 11
@@ -719,8 +718,6 @@ module internal LexerStateEncoding =
                 | LexerStringStyle.ExtendedInterpolated -> FSharpTokenizerColorState.TripleQuoteStringInComment
 
             encodeLexCont (state, int64 n, m.Start, ifdefs, LexerStringKind.String, stringNest, 0)
-        | LexCont.MLOnly(ifdefs, stringNest, m) ->
-            encodeLexCont (FSharpTokenizerColorState.CamlOnly, 0L, m.Start, ifdefs, LexerStringKind.String, stringNest, 0)
 
     let decodeLexInt (state: FSharpTokenizerLexState) =
         let tag, n1, p1, ifdefs, stringKind, stringNest, delimLen = decodeLexCont state
@@ -738,7 +735,6 @@ module internal LexerStateEncoding =
             LexCont.StringInComment(ifdefs, stringNest, LexerStringStyle.Verbatim, n1, mkRange "file" p1 p1)
         | FSharpTokenizerColorState.TripleQuoteStringInComment ->
             LexCont.StringInComment(ifdefs, stringNest, LexerStringStyle.TripleQuote, n1, mkRange "file" p1 p1)
-        | FSharpTokenizerColorState.CamlOnly -> LexCont.MLOnly(ifdefs, stringNest, mkRange "file" p1 p1)
         | FSharpTokenizerColorState.VerbatimString ->
             LexCont.String(ifdefs, stringNest, LexerStringStyle.Verbatim, stringKind, delimLen, mkRange "file" p1 p1)
         | FSharpTokenizerColorState.TripleQuoteString ->
@@ -919,11 +915,6 @@ type FSharpLineTokenizer(lexbuf: UnicodeLexing.Lexbuf, maxLength: int option, fi
             | LexerStringStyle.TripleQuote
             | LexerStringStyle.ExtendedInterpolated -> Lexer.tripleQuoteStringInComment n m lexargs skip lexbuf
 
-        | LexCont.MLOnly(ifdefs, stringNest, m) ->
-            lexargs.ifdefStack <- ifdefs
-            lexargs.stringNest <- stringNest
-            Lexer.mlOnly m lexargs skip lexbuf
-
     let columnsOfCurrentToken () =
         let leftp = lexbuf.StartPos
         let rightp = lexbuf.EndPos

src/Compiler/Service/ServiceLexing.fsi

@@ -27,7 +27,6 @@ type FSharpTokenizerColorState =
     | Comment = 5
     | StringInComment = 6
     | VerbatimStringInComment = 7
-    | CamlOnly = 8
     | VerbatimString = 9
     | SingleLineComment = 10
     | EndLineThenSkip = 11

src/Compiler/Service/SynExpr.fs

@@ -257,8 +257,8 @@ module SynExpr =
 
         match trimmed[0], originalNotation with
         | _, ":=" -> ValueSome ColonEquals
-        | _, ("||" | "or") -> ValueSome(BarBar(OriginalNotation originalNotation))
-        | _, ("&" | "&&") -> ValueSome(AmpAmp(OriginalNotation originalNotation))
+        | _, "||" -> ValueSome(BarBar(OriginalNotation originalNotation))
+        | _, "&&" -> ValueSome(AmpAmp(OriginalNotation originalNotation))
         | '|', _
         | '&', _
         | '<', _

src/Compiler/SyntaxTree/ParseHelpers.fs

@@ -166,7 +166,6 @@ type LexerContinuation =
         style: LexerStringStyle *
         int *
         range: range
-    | MLOnly of ifdef: LexerIfdefStackEntries * nesting: LexerInterpolatedStringNesting * range: range
     | EndLine of ifdef: LexerIfdefStackEntries * nesting: LexerInterpolatedStringNesting * LexerEndlineContinuation
 
     static member Default = LexCont.Token([], [])
@@ -179,8 +178,7 @@ type LexerContinuation =
         | LexCont.Comment(ifdef = ifd)
         | LexCont.SingleLineComment(ifdef = ifd)
         | LexCont.StringInComment(ifdef = ifd)
-        | LexCont.EndLine(ifdef = ifd)
-        | LexCont.MLOnly(ifdef = ifd) -> ifd
+        | LexCont.EndLine(ifdef = ifd) -> ifd
 
     member x.LexerInterpStringNesting =
         match x with
@@ -190,8 +188,7 @@ type LexerContinuation =
         | LexCont.Comment(nesting = nesting)
         | LexCont.SingleLineComment(nesting = nesting)
         | LexCont.StringInComment(nesting = nesting)
-        | LexCont.EndLine(nesting = nesting)
-        | LexCont.MLOnly(nesting = nesting) -> nesting
+        | LexCont.EndLine(nesting = nesting) -> nesting
 
 and LexCont = LexerContinuation
 
@@ -807,8 +804,6 @@ let checkEndOfFileError t =
     | LexCont.StringInComment(_, _, LexerStringStyle.TripleQuote, _, m) ->
         reportParseErrorAt m (FSComp.SR.parsEofInTripleQuoteStringInComment ())
 
-    | LexCont.MLOnly(_, _, m) -> reportParseErrorAt m (FSComp.SR.parsEofInIfOcaml ())
-
     | LexCont.EndLine(_, _, LexerEndlineContinuation.IfdefSkip(_, m)) -> reportParseErrorAt m (FSComp.SR.parsEofInDirective ())
 
     | LexCont.EndLine(endifs, nesting, LexerEndlineContinuation.Token)

src/Compiler/SyntaxTree/ParseHelpers.fsi

@@ -92,7 +92,6 @@ type LexerContinuation =
         style: LexerStringStyle *
         int *
         range: range
-    | MLOnly of ifdef: LexerIfdefStackEntries * nesting: LexerInterpolatedStringNesting * range: range
     | EndLine of ifdef: LexerIfdefStackEntries * nesting: LexerInterpolatedStringNesting * LexerEndlineContinuation
 
     member LexerIfdefStack: LexerIfdefStackEntries

src/Compiler/SyntaxTree/PrettyNaming.fs

@@ -255,27 +255,14 @@ let keywordsWithDescription: (string * string) list =
 
 let keywordLookup = set (List.map fst keywordsWithDescription)
 
-// Some legacy compat operator names are not encode using op_XYZ and this
-// do not carry sufficient information to distinguish between
-//     let (or) x y = x || y
-//     let ``or`` x y = x || y
-//     let (land) x y = x || y
-//     let ``land`` x y = x || y
-// All are deprecated except 'mod'. All except those two get double-backticks
 let IsUnencodedOpName (name: string) =
     match name with
     | "mod" -> true
     | _ -> false
 
-let IsUnencodedLegacyOpName (name: string) =
-    match name with
-    | "or" -> true
-    | _ -> false
-
 let IsIdentifierName (name: string) =
     not (keywordLookup.Contains name)
     && not (IsUnencodedOpName name)
-    && not (IsUnencodedLegacyOpName name)
     && let nameLen = name.Length in
 
        nameLen > 0
@@ -423,7 +410,7 @@ let CompileOpName op =
     match standardOpNames.TryGetValue op with
     | true, x -> x
     | false, _ ->
-        if IsUnencodedOpName op || IsUnencodedLegacyOpName op || IsIdentifierName op then
+        if IsUnencodedOpName op || IsIdentifierName op then
             op
         else
             compileCustomOpName op
@@ -771,8 +758,6 @@ let IsLogicalOpName (logicalName: string) =
 
 let (|Control|Equality|Relational|Indexer|FixedTypes|Other|) opName =
     match opName with
-    | "&"
-    | "or"
     | "&&"
     | "||" -> Control
     | "<>"

src/Compiler/TypedTree/TcGlobals.fs

@@ -688,11 +688,9 @@ type TcGlobals(
   let v_memoize_file =
       MemoizationTable<int, ILSourceDocument>("v_memoize_file", compute, keyComparer = HashIdentity.Structural)
 
-  let v_and_info =                   makeIntrinsicValRef(fslib_MFIntrinsicOperators_nleref,                    CompileOpName "&"                      , None                 , None          , [],         mk_rel_sig v_bool_ty)
   let v_addrof_info =                makeIntrinsicValRef(fslib_MFIntrinsicOperators_nleref,                    CompileOpName "~&"                     , None                 , None          , [vara],     ([[varaTy]], mkByrefTy varaTy))
   let v_addrof2_info =               makeIntrinsicValRef(fslib_MFIntrinsicOperators_nleref,                    CompileOpName "~&&"                    , None                 , None          , [vara],     ([[varaTy]], mkNativePtrTy varaTy))
   let v_and2_info =                  makeIntrinsicValRef(fslib_MFIntrinsicOperators_nleref,                    CompileOpName "&&"                     , None                 , None          , [],         mk_rel_sig v_bool_ty)
-  let v_or_info =                    makeIntrinsicValRef(fslib_MFIntrinsicOperators_nleref,                    "or"                                   , None                 , Some "Or"     , [],         mk_rel_sig v_bool_ty)
   let v_or2_info =                   makeIntrinsicValRef(fslib_MFIntrinsicOperators_nleref,                    CompileOpName "||"                     , None                 , None          , [],         mk_rel_sig v_bool_ty)
   let v_compare_operator_info                = makeIntrinsicValRef(fslib_MFOperators_nleref,                   "compare"                              , None                 , Some "Compare", [vara],     mk_compare_sig varaTy)
   let v_equals_operator_info                 = makeIntrinsicValRef(fslib_MFOperators_nleref,                   CompileOpName "="                      , None                 , None          , [vara],     mk_rel_sig varaTy)
@@ -1574,11 +1572,9 @@ type TcGlobals(
   member _.new_decimal_info = v_new_decimal_info
   member _.seq_info    = v_seq_info
   member val seq_vref    = (ValRefForIntrinsic v_seq_info)
-  member val and_vref    = (ValRefForIntrinsic v_and_info)
   member val and2_vref   = (ValRefForIntrinsic v_and2_info)
   member val addrof_vref = (ValRefForIntrinsic v_addrof_info)
   member val addrof2_vref = (ValRefForIntrinsic v_addrof2_info)
-  member val or_vref     = (ValRefForIntrinsic v_or_info)
   member val splice_expr_vref     = (ValRefForIntrinsic v_splice_expr_info)
   member val splice_raw_expr_vref     = (ValRefForIntrinsic v_splice_raw_expr_info)
   member val or2_vref    = (ValRefForIntrinsic v_or2_info)

src/Compiler/TypedTree/TcGlobals.fsi

@@ -278,8 +278,6 @@ type internal TcGlobals =
 
     member and2_vref: TypedTree.ValRef
 
-    member and_vref: TypedTree.ValRef
-
     member array2D_get_info: IntrinsicValRef
 
     member array2D_get_vref: TypedTree.ValRef
@@ -931,8 +929,6 @@ type internal TcGlobals =
 
     member or2_vref: TypedTree.ValRef
 
-    member or_vref: TypedTree.ValRef
-
     member outref_tcr: TypedTree.EntityRef
 
     member pathMap: Internal.Utilities.PathMap