Remove limitations on custom operation overloads

Nhowka · web-flow · commit 854f080c1fb4 · 2018-05-12T14:53:17.000-03:00
- Check 1:1 by operation/method names instead of count
- Remove arg count check
diff --git a/src/fsharp/TypeChecker.fs b/src/fsharp/TypeChecker.fs
@@ -7165,17 +7165,24 @@ and TcComputationExpression cenv env overallTy mWhole interpExpr builderTy tpenv
 
                     Some (nm, maintainsVarSpaceUsingBind, maintainsVarSpace, allowInto, isLikeZip, isLikeJoin, isLikeGroupJoin, joinConditionWord, methInfo))
 
-    let customOperationMethodsIndexedByKeyword = 
+    let customOperationMethodsIndexedByKeyword =
         customOperationMethods
         |> Seq.groupBy (fun (nm, _, _, _, _, _, _, _, _) -> nm)
-        |> Seq.map (fun (nm, g) -> (nm, Seq.toList g))
+        |> Seq.map (fun (nm, g) ->
+            (nm,
+                g
+                |> Seq.distinctBy (fun (_, _, _, _, _, _, _, _, methInfo) -> methInfo.LogicalName)
+                |> Seq.toList))
         |> dict
 
     // Check for duplicates by method name (keywords and method names must be 1:1)
     let customOperationMethodsIndexedByMethodName = 
         customOperationMethods
-        |> Seq.groupBy (fun (_, _, _, _, _, _, _, _, methInfo) -> methInfo.LogicalName)
-        |> Seq.map (fun (nm, g) -> (nm, Seq.toList g))
+        |> Seq.groupBy (fun (_, _, _, _, _, _, _, _, methInfo) -> methInfo.LogicalName)        
+        |> Seq.map (fun (nm, g) ->
+            (nm,
+                g 
+                |> Seq.distinctBy (fun (nm, _, _, _, _, _, _, _, _) -> nm) |> Seq.toList ))
         |> dict
 
         
@@ -7809,18 +7816,12 @@ and TcComputationExpression cenv env overallTy mWhole interpExpr builderTy tpenv
                         let maintainsVarSpace = customOperationMaintainsVarSpace nm
                         let maintainsVarSpaceUsingBind = customOperationMaintainsVarSpaceUsingBind nm
 
-                        let expectedArgCount = expectedArgCountForCustomOperator nm 
-
                         let dataCompAfterOp = 
                             match opExpr with 
                             | StripApps(SingleIdent nm, args) -> 
-                                if args.Length = expectedArgCount then 
-                                    // Check for the [<ProjectionParameter>] attribute on each argument position
-                                    let args = args |> List.mapi (fun i arg -> if isCustomOperationProjectionParameter (i+1) nm then SynExpr.Lambda (false, false, varSpaceSimplePat, arg, arg.Range.MakeSynthetic()) else arg)
-                                    mkSynCall methInfo.DisplayName mClause (dataCompPrior :: args)
-                                else 
-                                    errorR(Error(FSComp.SR.tcCustomOperationHasIncorrectArgCount(nm.idText, expectedArgCount, args.Length), nm.idRange))
-                                    mkSynCall methInfo.DisplayName mClause ([ dataCompPrior ] @ List.init expectedArgCount (fun i -> arbExpr("_arg" + string i, mClause))) 
+                                // Check for the [<ProjectionParameter>] attribute on each argument position
+                                let args = args |> List.mapi (fun i arg -> if isCustomOperationProjectionParameter (i+1) nm then SynExpr.Lambda (false, false, varSpaceSimplePat, arg, arg.Range.MakeSynthetic()) else arg)
+                                mkSynCall methInfo.DisplayName mClause (dataCompPrior :: args)
                             | _ -> failwith "unreachable"
 
                         match optionalCont with 
