Add SynType.Or.

src/Compiler/Checking/CheckExpressions.fs

@@ -3953,7 +3953,7 @@ let rec TcTyparConstraint ridx (cenv: cenv) newOk checkConstraints occ (env: TcE
     | SynTypeConstraint.WhereTyparIsDelegate(tp, synTys, m) ->
         TcConstraintWhereTyparIsDelegate cenv env newOk checkConstraints occ tpenv tp synTys m
 
-    | SynTypeConstraint.WhereTyparSupportsMember(synSupportTys, synMemberSig, m) ->
+    | SynTypeConstraint.WhereTyparSupportsMember(TypesForTypar synSupportTys, synMemberSig, m) ->
         TcConstraintWhereTyparSupportsMember cenv env newOk tpenv synSupportTys synMemberSig m
 
     | SynTypeConstraint.WhereSelfConstrained(ty, m) ->
@@ -4361,6 +4361,9 @@ and TcTypeOrMeasure kindOpt (cenv: cenv) newOk checkConstraints occ (iwsam: Warn
     | SynType.Paren(innerType, _)
     | SynType.SignatureParameter(usedType = innerType) ->
         TcTypeOrMeasure kindOpt cenv newOk checkConstraints occ iwsam env tpenv innerType
+
+    | SynType.Or(range = m) ->
+        error(Error((FSComp.SR.tcOrTypeInvalidInDeclaration()), m))
 
 and CheckIWSAM (cenv: cenv) (env: TcEnv) checkConstraints iwsam m tcref =
     let g = cenv.g
@@ -5651,7 +5654,7 @@ and TcExprUndelayed (cenv: cenv) (overallTy: OverallTy) env tpenv (synExpr: SynE
         TcNonControlFlowExpr env <| fun env ->
         TcExprNamedIndexPropertySet cenv overallTy env tpenv (synLongId, synExpr1, synExpr2, mStmt)
 
-    | SynExpr.TraitCall (tps, synMemberSig, arg, m) ->
+    | SynExpr.TraitCall (TypesForTypar tps, synMemberSig, arg, m) ->
         TcNonControlFlowExpr env <| fun env ->
         TcExprTraitCall cenv overallTy env tpenv (tps, synMemberSig, arg, m)
 

src/Compiler/FSComp.txt

@@ -1656,3 +1656,4 @@ reprStateMachineInvalidForm,"The state machine has an unexpected form"
 3546,parsExpectingPatternInTuple,"Expecting pattern"
 3547,parsExpectedPatternAfterToken,"Expected a pattern after this point"
 3548,matchNotAllowedForUnionCaseWithNoData,"Pattern discard is not allowed for union case that takes no data."
+3549,tcOrTypeInvalidInDeclaration,"Or type variables are not permitted in this declaration"

src/Compiler/Service/ServiceParseTreeWalk.fs

@@ -821,7 +821,8 @@ module SyntaxTraversal =
                 | SynType.WithGlobalConstraints (ty, _, _)
                 | SynType.Array (_, ty, _) -> traverseSynType path ty
                 | SynType.StaticConstantNamed (ty1, ty2, _)
-                | SynType.MeasureDivide (ty1, ty2, _) -> [ ty1; ty2 ] |> List.tryPick (traverseSynType path)
+                | SynType.MeasureDivide (ty1, ty2, _)
+                | SynType.Or (ty1, ty2, _, _) -> [ ty1; ty2 ] |> List.tryPick (traverseSynType path)
                 | SynType.Tuple (path = segments) -> getTypeFromTuplePath segments |> List.tryPick (traverseSynType path)
                 | SynType.StaticConstantExpr (expr, _) -> traverseSynExpr [] expr
                 | SynType.Paren (innerType = t)

src/Compiler/Service/ServiceParsedInputOps.fs

@@ -607,7 +607,7 @@ module ParsedInput =
             | SynTypeConstraint.WhereTyparIsComparable (t, _) -> walkTypar t
             | SynTypeConstraint.WhereTyparIsEquatable (t, _) -> walkTypar t
             | SynTypeConstraint.WhereTyparSubtypeOfType (t, ty, _) -> walkTypar t |> Option.orElseWith (fun () -> walkType ty)
-            | SynTypeConstraint.WhereTyparSupportsMember (ts, sign, _) ->
+            | SynTypeConstraint.WhereTyparSupportsMember (TypesForTypar ts, sign, _) ->
                 List.tryPick walkType ts |> Option.orElseWith (fun () -> walkMemberSig sign)
             | SynTypeConstraint.WhereTyparIsEnum (t, ts, _) -> walkTypar t |> Option.orElseWith (fun () -> List.tryPick walkType ts)
             | SynTypeConstraint.WhereTyparIsDelegate (t, ts, _) -> walkTypar t |> Option.orElseWith (fun () -> List.tryPick walkType ts)
@@ -668,7 +668,8 @@ module ParsedInput =
             | SynType.Fun (argType = t1; returnType = t2) -> walkType t1 |> Option.orElseWith (fun () -> walkType t2)
             | SynType.WithGlobalConstraints (t, _, _) -> walkType t
             | SynType.HashConstraint (t, _) -> walkType t
-            | SynType.MeasureDivide (t1, t2, _) -> walkType t1 |> Option.orElseWith (fun () -> walkType t2)
+            | SynType.MeasureDivide (t1, t2, _)
+            | SynType.Or (t1, t2, _, _) -> walkType t1 |> Option.orElseWith (fun () -> walkType t2)
             | SynType.MeasurePower (t, _, _) -> walkType t
             | SynType.Paren (t, _)
             | SynType.SignatureParameter (usedType = t) -> walkType t
@@ -838,7 +839,7 @@ module ParsedInput =
 
             | SynExpr.DoBang (e, _) -> walkExprWithKind parentKind e
 
-            | SynExpr.TraitCall (ts, sign, e, _) ->
+            | SynExpr.TraitCall (TypesForTypar ts, sign, e, _) ->
                 List.tryPick walkType ts
                 |> Option.orElseWith (fun () -> walkMemberSig sign)
                 |> Option.orElseWith (fun () -> walkExprWithKind parentKind e)
@@ -1621,7 +1622,7 @@ module ParsedInput =
             | SynTypeConstraint.WhereTyparIsDelegate (t, ts, _) ->
                 walkTypar t
                 List.iter walkType ts
-            | SynTypeConstraint.WhereTyparSupportsMember (ts, sign, _) ->
+            | SynTypeConstraint.WhereTyparSupportsMember (TypesForTypar ts, sign, _) ->
                 List.iter walkType ts
                 walkMemberSig sign
             | SynTypeConstraint.WhereSelfConstrained (ty, _) -> walkType ty
@@ -1673,7 +1674,8 @@ module ParsedInput =
             | SynType.Paren (t, _)
             | SynType.SignatureParameter (usedType = t) -> walkType t
             | SynType.Fun (argType = t1; returnType = t2)
-            | SynType.MeasureDivide (t1, t2, _) ->
+            | SynType.MeasureDivide (t1, t2, _)
+            | SynType.Or (t1, t2, _, _) ->
                 walkType t1
                 walkType t2
             | SynType.LongIdent ident -> addLongIdentWithDots ident
@@ -1820,7 +1822,7 @@ module ParsedInput =
                     walkExpr eAndBang
 
                 walkExpr e2
-            | SynExpr.TraitCall (ts, sign, e, _) ->
+            | SynExpr.TraitCall (TypesForTypar ts, sign, e, _) ->
                 List.iter walkType ts
                 walkMemberSig sign
                 walkExpr e

src/Compiler/SyntaxTree/SyntaxTree.fs

@@ -330,7 +330,7 @@ type SynTypeConstraint =
 
     | WhereTyparSubtypeOfType of typar: SynTypar * typeName: SynType * range: range
 
-    | WhereTyparSupportsMember of typars: SynType list * memberSig: SynMemberSig * range: range
+    | WhereTyparSupportsMember of typars: SynType * memberSig: SynMemberSig * range: range
 
     | WhereTyparIsEnum of typar: SynTypar * typeArgs: SynType list * range: range
 
@@ -441,6 +441,8 @@ type SynType =
 
     | SignatureParameter of attributes: SynAttributes * optional: bool * id: Ident option * usedType: SynType * range: range
 
+    | Or of lhsType: SynType * rhsType: SynType * range: range * trivia: SynTypeOrTrivia
+
     member x.Range =
         match x with
         | SynType.App (range = m)
@@ -459,7 +461,8 @@ type SynType =
         | SynType.MeasureDivide (range = m)
         | SynType.MeasurePower (range = m)
         | SynType.Paren (range = m)
-        | SynType.SignatureParameter (range = m) -> m
+        | SynType.SignatureParameter (range = m)
+        | SynType.Or (range = m) -> m
         | SynType.LongIdent lidwd -> lidwd.Range
 
 [<NoEquality; NoComparison; RequireQualifiedAccess>]
@@ -647,7 +650,7 @@ type SynExpr =
 
     | AddressOf of isByref: bool * expr: SynExpr * opRange: range * range: range
 
-    | TraitCall of supportTys: SynType list * traitSig: SynMemberSig * argExpr: SynExpr * range: range
+    | TraitCall of supportTys: SynType * traitSig: SynMemberSig * argExpr: SynExpr * range: range
 
     | JoinIn of lhsExpr: SynExpr * lhsRange: range * rhsExpr: SynExpr * range: range
 

src/Compiler/SyntaxTree/SyntaxTree.fsi

@@ -405,7 +405,7 @@ type SynTypeConstraint =
     | WhereTyparSubtypeOfType of typar: SynTypar * typeName: SynType * range: range
 
     /// F# syntax is ^T: (static member MemberName: ^T * int -> ^T)
-    | WhereTyparSupportsMember of typars: SynType list * memberSig: SynMemberSig * range: range
+    | WhereTyparSupportsMember of typars: SynType * memberSig: SynMemberSig * range: range
 
     /// F# syntax is 'typar: enum<'UnderlyingType>
     | WhereTyparIsEnum of typar: SynTypar * typeArgs: SynType list * range: range
@@ -518,6 +518,9 @@ type SynType =
         usedType: SynType *
         range: range
 
+    /// F# syntax: ^a or ^b, used in trait calls
+    | Or of lhsType: SynType * rhsType: SynType * range: range * trivia: SynTypeOrTrivia
+
     /// Gets the syntax range of this construct
     member Range: range
 
@@ -817,7 +820,7 @@ type SynExpr =
     | AddressOf of isByref: bool * expr: SynExpr * opRange: range * range: range
 
     /// F# syntax: ((type1 or ... or typeN): (member-dig) expr)
-    | TraitCall of supportTys: SynType list * traitSig: SynMemberSig * argExpr: SynExpr * range: range
+    | TraitCall of supportTys: SynType * traitSig: SynMemberSig * argExpr: SynExpr * range: range
 
     /// F# syntax: ... in ...
     /// Computation expressions only, based on JOIN_IN token from lex filter

src/Compiler/SyntaxTree/SyntaxTreeOps.fs

@@ -1082,3 +1082,12 @@ let (|MultiDimensionArrayType|_|) (t: SynType) =
         else
             None
     | _ -> None
+
+let (|TypesForTypar|) (t: SynType) =
+    let rec visit continuation t =
+        match t with
+        | SynType.Paren (innerT, _) -> visit continuation innerT
+        | SynType.Or (lhsT, rhsT, _, _) -> visit (fun lhsTs -> [ yield! lhsTs; yield rhsT ] |> continuation) lhsT
+        | _ -> continuation [ t ]
+
+    visit id t

src/Compiler/SyntaxTree/SyntaxTreeOps.fsi

@@ -357,3 +357,5 @@ val desugarGetSetMembers: memberDefns: SynMemberDefns -> SynMemberDefns
 val getTypeFromTuplePath: path: SynTupleTypeSegment list -> SynType list
 
 val (|MultiDimensionArrayType|_|): t: SynType -> (int * SynType * range) option
+
+val (|TypesForTypar|): t: SynType -> SynType list

src/Compiler/SyntaxTree/SyntaxTrivia.fs

@@ -265,3 +265,6 @@ type SynMemberGetSetTrivia =
 
 [<NoEquality; NoComparison>]
 type SynArgPatsNamePatPairsTrivia = { ParenRange: range }
+
+[<NoEquality; NoComparison>]
+type SynTypeOrTrivia = { OrKeyword: range }

src/Compiler/SyntaxTree/SyntaxTrivia.fsi

@@ -384,3 +384,11 @@ type SynArgPatsNamePatPairsTrivia =
         /// The syntax range from the beginning of the `(` token till the end of the `)` token.
         ParenRange: range
     }
+
+/// Represents additional information for SynType.Or
+[<NoEquality; NoComparison>]
+type SynTypeOrTrivia =
+    {
+        /// The syntax range of the `or` keyword
+        OrKeyword: range
+    }

src/Compiler/pars.fsy

@@ -2234,10 +2234,12 @@ typeConstraint:
 
   | typar COLON LPAREN classMemberSpfn rparen 
      { let tp = $1
-       SynTypeConstraint.WhereTyparSupportsMember([ SynType.Var(tp, tp.Range) ], $4, lhs parseState) }
+       SynTypeConstraint.WhereTyparSupportsMember(SynType.Var(tp, tp.Range), $4, lhs parseState) }
 
   | LPAREN typeAlts rparen COLON LPAREN classMemberSpfn rparen 
-     { SynTypeConstraint.WhereTyparSupportsMember(List.rev($2), $6, lhs parseState) }
+     { let mParen = rhs2 parseState 1 3
+       let t = SynType.Paren($2, mParen)
+       SynTypeConstraint.WhereTyparSupportsMember(t, $6, lhs parseState) }
 
   | typar COLON DELEGATE typeArgsNoHpaDeprecated
      { let _ltm, _gtm, args, _commas, mWhole = $4
@@ -2262,10 +2264,12 @@ typeConstraint:
 
 typeAlts:
   | typeAlts OR appType
-     { $3 :: $1 }
+     { let mOr = rhs parseState 2
+       let m = unionRanges $1.Range $3.Range
+       SynType.Or($1, $3, m, { OrKeyword = mOr }) }
 
   | appType
-     { [$1] }	
+     { $1 }
 
 /* The core of a union type definition */
 unionTypeRepr:
@@ -4493,17 +4497,20 @@ parenExprBody:
 
 typars:
   | typar 
-      { [SynType.Var($1, rhs parseState 1)] }
+      { SynType.Var($1, rhs parseState 1) }
 
-  | LPAREN typarAlts rparen 
-      { List.rev $2 }
+  | LPAREN typarAlts rparen
+      { let m = rhs2 parseState 1 3
+        SynType.Paren($2, m) }
 
 typarAlts:
   | typarAlts OR appType
-      {$3 :: $1}
+      { let mOr = rhs parseState 2
+        let m = unionRanges $1.Range $3.Range
+        SynType.Or($1, $3, m, { OrKeyword = mOr }) }
 
   | typar
-      { [SynType.Var($1, rhs parseState 1)] }
+      { SynType.Var($1, rhs parseState 1) }
 
 braceExpr:
   | LBRACE braceExprBody rbrace 

src/Compiler/xlf/FSComp.txt.cs.xlf

@@ -907,6 +907,11 @@
         <target state="translated">Hodnota {0} není funkce a nepodporuje zápis indexu.</target>
         <note />
       </trans-unit>
+      <trans-unit id="tcOrTypeInvalidInDeclaration">
+        <source>Or type variables are not permitted in this declaration</source>
+        <target state="new">Or type variables are not permitted in this declaration</target>
+        <note />
+      </trans-unit>
       <trans-unit id="tcOtherThenAdjacentListArgumentNeedsAdjustment">
         <source>The syntax 'expr1[expr2]' is ambiguous when used as an argument. See https://aka.ms/fsharp-index-notation. If you intend indexing or slicing then you must use 'expr1.[expr2]' in argument position. If calling a function with multiple curried arguments, add a space between them, e.g. 'someFunction expr1 [expr2]'.</source>
         <target state="translated">Syntaxe expr1[expr2] je při použití jako argument nejednoznačná. Více informací: https://aka.ms/fsharp-index-notation. Pokud plánujete indexování nebo vytváření řezů, musíte použít expr1.[expr2] na pozici argumentu. Pokud voláte funkci s vícenásobnými curryfikovanými argumenty, přidejte mezi ně mezeru, třeba someFunction expr1 [expr2].</target>

src/Compiler/xlf/FSComp.txt.de.xlf

@@ -907,6 +907,11 @@
         <target state="translated">Der Wert "{0}" ist keine Funktion und unterstützt keine Indexnotation.</target>
         <note />
       </trans-unit>
+      <trans-unit id="tcOrTypeInvalidInDeclaration">
+        <source>Or type variables are not permitted in this declaration</source>
+        <target state="new">Or type variables are not permitted in this declaration</target>
+        <note />
+      </trans-unit>
       <trans-unit id="tcOtherThenAdjacentListArgumentNeedsAdjustment">
         <source>The syntax 'expr1[expr2]' is ambiguous when used as an argument. See https://aka.ms/fsharp-index-notation. If you intend indexing or slicing then you must use 'expr1.[expr2]' in argument position. If calling a function with multiple curried arguments, add a space between them, e.g. 'someFunction expr1 [expr2]'.</source>
         <target state="translated">Die Syntax "expr1[expr2]" ist mehrdeutig, wenn sie als Argument verwendet wird. Siehe https://aka.ms/fsharp-index-notation. Wenn Sie indizieren oder aufteilen möchten, müssen Sie "expr1.[expr2]' in Argumentposition verwenden. Wenn Sie eine Funktion mit mehreren geschweiften Argumenten aufrufen, fügen Sie ein Leerzeichen dazwischen hinzu, z. B. "someFunction expr1 [expr2]".</target>

src/Compiler/xlf/FSComp.txt.es.xlf

@@ -907,6 +907,11 @@
         <target state="translated">El valor "{0}" no es una función y no admite la notación de índices.</target>
         <note />
       </trans-unit>
+      <trans-unit id="tcOrTypeInvalidInDeclaration">
+        <source>Or type variables are not permitted in this declaration</source>
+        <target state="new">Or type variables are not permitted in this declaration</target>
+        <note />
+      </trans-unit>
       <trans-unit id="tcOtherThenAdjacentListArgumentNeedsAdjustment">
         <source>The syntax 'expr1[expr2]' is ambiguous when used as an argument. See https://aka.ms/fsharp-index-notation. If you intend indexing or slicing then you must use 'expr1.[expr2]' in argument position. If calling a function with multiple curried arguments, add a space between them, e.g. 'someFunction expr1 [expr2]'.</source>
         <target state="translated">La sintaxis "expr1[expr2]" es ambigua cuando se usa como argumento. Vea https://aka.ms/fsharp-index-notation. Si piensa indexar o segmentar, debe usar "expr1.[expr2]" en la posición del argumento. Si se llama a una función con varios argumentos currificados, se agregará un espacio entre ellos, por ejemplo, "unaFunción expr1 [expr2]".</target>

src/Compiler/xlf/FSComp.txt.fr.xlf

@@ -907,6 +907,11 @@
         <target state="translated">La valeur « {0} » n’est pas une fonction et ne prend pas en charge la notation d’index.</target>
         <note />
       </trans-unit>
+      <trans-unit id="tcOrTypeInvalidInDeclaration">
+        <source>Or type variables are not permitted in this declaration</source>
+        <target state="new">Or type variables are not permitted in this declaration</target>
+        <note />
+      </trans-unit>
       <trans-unit id="tcOtherThenAdjacentListArgumentNeedsAdjustment">
         <source>The syntax 'expr1[expr2]' is ambiguous when used as an argument. See https://aka.ms/fsharp-index-notation. If you intend indexing or slicing then you must use 'expr1.[expr2]' in argument position. If calling a function with multiple curried arguments, add a space between them, e.g. 'someFunction expr1 [expr2]'.</source>
         <target state="translated">La syntaxe « expr1[expr2] » est ambiguë lorsqu’elle est utilisée comme argument. Voir https://aka.ms/fsharp-index-notation. Si vous avez l’intention d’indexer ou de découper, vous devez utiliser « expr1.[expr2] » en position d’argument. Si vous appelez une fonction avec plusieurs arguments codés, ajoutez un espace entre eux, par exemple « someFunction expr1 [expr2] ».</target>

src/Compiler/xlf/FSComp.txt.it.xlf

@@ -907,6 +907,11 @@
         <target state="translated">Questo valore '{0}' non è una funzione e non supporta la notazione degli indici.</target>
         <note />
       </trans-unit>
+      <trans-unit id="tcOrTypeInvalidInDeclaration">
+        <source>Or type variables are not permitted in this declaration</source>
+        <target state="new">Or type variables are not permitted in this declaration</target>
+        <note />
+      </trans-unit>
       <trans-unit id="tcOtherThenAdjacentListArgumentNeedsAdjustment">
         <source>The syntax 'expr1[expr2]' is ambiguous when used as an argument. See https://aka.ms/fsharp-index-notation. If you intend indexing or slicing then you must use 'expr1.[expr2]' in argument position. If calling a function with multiple curried arguments, add a space between them, e.g. 'someFunction expr1 [expr2]'.</source>
         <target state="translated">La sintassi 'expr1[expr2]' è ambigua se usata come argomento. Vedere https://aka.ms/fsharp-index-notation. Se si intende eseguire l'indicizzazione o il sezionamento, è necessario usare 'expr1.[expr2]' nella posizione dell'argomento. Se si chiama una funzione con più argomenti sottoposti a corsi, aggiungere uno spazio tra di essi, ad esempio 'someFunction expr1 [expr2]'.</target>

src/Compiler/xlf/FSComp.txt.ja.xlf

@@ -907,6 +907,11 @@
         <target state="translated">値 '{0}' は関数ではなく、インデックス表記をサポートしていません。</target>
         <note />
       </trans-unit>
+      <trans-unit id="tcOrTypeInvalidInDeclaration">
+        <source>Or type variables are not permitted in this declaration</source>
+        <target state="new">Or type variables are not permitted in this declaration</target>
+        <note />
+      </trans-unit>
       <trans-unit id="tcOtherThenAdjacentListArgumentNeedsAdjustment">
         <source>The syntax 'expr1[expr2]' is ambiguous when used as an argument. See https://aka.ms/fsharp-index-notation. If you intend indexing or slicing then you must use 'expr1.[expr2]' in argument position. If calling a function with multiple curried arguments, add a space between them, e.g. 'someFunction expr1 [expr2]'.</source>
         <target state="translated">構文 'expr1[expr2]' は引数として使用されている場合、あいまいです。https://aka.ms/fsharp-index-notation を参照してください。インデックス作成またはスライスを行う場合は、'expr1.[expr2]' を引数の位置に使用する必要があります。複数のカリー化された引数を持つ関数を呼び出す場合は、'expr1 [expr2]' のように間にスペースを追加します。</target>