remove warnings

Author: dsyme

src/fsharp/vs/Exprs.fs

@@ -134,20 +134,20 @@ module ExprTranslationImpl =
 /// The core tree of data produced by converting F# compiler TAST expressions into the form which we make available through the compiler API
 /// through active patterns.
 type E =
-    | Value  of FSharpMemberFunctionOrValue
+    | Value  of FSharpMemberOrFunctionOrValue
     | ThisValue  of FSharpType 
     | BaseValue  of FSharpType 
     | Application of FSharpExpr * FSharpType list * FSharpExpr list  
-    | Lambda of FSharpMemberFunctionOrValue * FSharpExpr  
+    | Lambda of FSharpMemberOrFunctionOrValue * FSharpExpr  
     | TypeLambda of FSharpGenericParameter list * FSharpExpr  
     | Quote  of FSharpExpr  
     | IfThenElse   of FSharpExpr * FSharpExpr * FSharpExpr  
     | DecisionTree   of FSharpExpr * (FSharpMemberOrFunctionOrValue list * FSharpExpr) list
     | DecisionTreeSuccess of int * FSharpExpr list
     | Call of FSharpExpr option * FSharpMemberOrFunctionOrValue * FSharpType list * FSharpType list * FSharpExpr list 
     | NewObject of FSharpMemberOrFunctionOrValue * FSharpType list * FSharpExpr list 
-    | LetRec of ( FSharpMemberFunctionOrValue * FSharpExpr) list * FSharpExpr  
-    | Let of (FSharpMemberFunctionOrValue * FSharpExpr) * FSharpExpr 
+    | LetRec of ( FSharpMemberOrFunctionOrValue * FSharpExpr) list * FSharpExpr  
+    | Let of (FSharpMemberOrFunctionOrValue * FSharpExpr) * FSharpExpr 
     | NewRecord of FSharpType * FSharpExpr list 
     | ObjectExpr of FSharpType * FSharpExpr * FSharpObjectExprOverride list * (FSharpType * FSharpObjectExprOverride list) list
     | FSharpFieldGet of  FSharpExpr option * FSharpType * FSharpField 
@@ -173,14 +173,14 @@ type E =
     | FastIntegerForLoop of FSharpExpr * FSharpExpr * FSharpExpr * bool
     | WhileLoop of FSharpExpr * FSharpExpr  
     | TryFinally of FSharpExpr * FSharpExpr  
-    | TryWith of FSharpExpr * FSharpMemberFunctionOrValue * FSharpExpr * FSharpMemberFunctionOrValue * FSharpExpr  
+    | TryWith of FSharpExpr * FSharpMemberOrFunctionOrValue * FSharpExpr * FSharpMemberOrFunctionOrValue * FSharpExpr  
     | NewDelegate of FSharpType * FSharpExpr  
     | ILFieldGet of FSharpExpr option * FSharpType * string 
     | ILFieldSet of FSharpExpr option * FSharpType * string  * FSharpExpr 
     | ILAsm of string * FSharpType list * FSharpExpr list
 
 /// Used to represent the information at an object expression member 
-and [<Sealed>]  FSharpObjectExprOverride(sgn: FSharpAbstractSignature, gps: FSharpGenericParameter list, args:FSharpMemberFunctionOrValue list list, body: FSharpExpr) = 
+and [<Sealed>]  FSharpObjectExprOverride(sgn: FSharpAbstractSignature, gps: FSharpGenericParameter list, args:FSharpMemberOrFunctionOrValue list list, body: FSharpExpr) = 
     member __.Signature = sgn
     member __.GenericParameters = gps
     member __.CurriedParameterGroups = args
@@ -435,7 +435,7 @@ module FSharpExprConvert =
                 let callArgs = (objArgs::untupledCurriedArgs) |> List.concat
                 let enclTyArgs, methTyArgs = List.splitAfter numEnclTypeArgs tyargs
                 // tailcall
-                ConvObjectModelCallLinear cenv env (isNewObj, FSharpMemberFunctionOrValue(cenv,vref), enclTyArgs, methTyArgs, callArgs) contf2
+                ConvObjectModelCallLinear cenv env (isNewObj, FSharpMemberOrFunctionOrValue(cenv,vref), enclTyArgs, methTyArgs, callArgs) contf2
             else
                 let v = FSharpMemberOrFunctionOrValue(cenv, vref)
                 // tailcall
@@ -752,7 +752,7 @@ module FSharpExprConvert =
             let envinner = env.BindVal v
             Some(vR,rhsR),envinner
 
-    and ConvObjectModelCallLinear cenv env (isNewObj, v:FSharpMemberFunctionOrValue, enclTyArgs, methTyArgs,callArgs) contf =
+    and ConvObjectModelCallLinear cenv env (isNewObj, v:FSharpMemberOrFunctionOrValue, enclTyArgs, methTyArgs,callArgs) contf =
         let enclTyArgsR = ConvTypes cenv enclTyArgs
         let methTyArgsR = ConvTypes cenv methTyArgs
         let obj, callArgs = 
@@ -802,11 +802,11 @@ module FSharpExprConvert =
         elif v.BaseOrThisInfo = BaseVal then 
             E.BaseValue(ConvType cenv v.Type) 
         else 
-            E.Value(FSharpMemberFunctionOrValue(cenv, vref)) 
+            E.Value(FSharpMemberOrFunctionOrValue(cenv, vref)) 
 
     and ConvVal cenv (v:Val) =  
         let vref = mkLocalValRef v 
-        FSharpMemberFunctionOrValue(cenv,  vref) 
+        FSharpMemberOrFunctionOrValue(cenv,  vref) 
 
     and ConvConst cenv env m c ty =
         match TryEliminateDesugaredConstants cenv.g m c with 

src/fsharp/vs/Exprs.fsi

@@ -67,7 +67,7 @@ and [<Sealed>]  FSharpObjectExprOverride =
     /// The generic parameters of the method
     member GenericParameters : FSharpGenericParameter list
     /// The parameters of the method
-    member CurriedParameterGroups : FSharpMemberFunctionOrValue list list
+    member CurriedParameterGroups : FSharpMemberOrFunctionOrValue list list
     /// The expression that forms the body of the method
     member Body : FSharpExpr
 
@@ -101,10 +101,10 @@ module BasicPatterns =
 
     /// Matches expressions which are calls to members or module-defined functions. When calling curried functions and members the
     /// arguments are collapsed to a single collection of arguments, as done in the compiled version of these.
-    val (|Call|_|) : FSharpExpr -> (FSharpExpr option * FSharpMemberFunctionOrValue * FSharpType list * FSharpType list * FSharpExpr list) option 
+    val (|Call|_|) : FSharpExpr -> (FSharpExpr option * FSharpMemberOrFunctionOrValue * FSharpType list * FSharpType list * FSharpExpr list) option 
 
     /// Matches expressions which are calls to object constructors 
-    val (|NewObject|_|) : FSharpExpr -> (FSharpMemberFunctionOrValue * FSharpType list * FSharpExpr list) option 
+    val (|NewObject|_|) : FSharpExpr -> (FSharpMemberOrFunctionOrValue * FSharpType list * FSharpExpr list) option 
 
     /// Matches expressions which are uses of the 'this' value
     val (|ThisValue|_|) : FSharpExpr -> FSharpType  option