Merge pull request #1 from vasily-kirichenko/tuple-spike-fix-compilation

fix compilation
fsharp · May 27, 2016 · 8954af0 · 8954af0
2 parents ff5279d + d478c7b
commit 8954af0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/src/fsharp/TastOps.fs b/src/fsharp/TastOps.fs
@@ -5169,13 +5169,8 @@ let rec tyOfExpr g e =
         | TOp.ExnConstr _ -> g.exn_ty
         | TOp.Bytes _ -> mkByteArrayTy g
         | TOp.UInt16s _ -> mkArrayType g g.uint16_ty
-<<<<<<< HEAD
-        | TOp.TupleFieldGet(_,i) -> List.nth tinst i
+        | TOp.TupleFieldGet(_,i) -> List.item i tinst
         | TOp.Tuple tupInfo -> mkAnyTupledTy g tupInfo tinst
-=======
-        | TOp.TupleFieldGet(i) -> List.item i tinst
-        | TOp.Tuple -> mkTupleTy tinst
->>>>>>> 0a57ced21f02d3142d049ab2d394a6fa77591de7
         | (TOp.For _ | TOp.While _) -> g.unit_ty
         | TOp.Array -> (match tinst with [ty] -> mkArrayType g ty | _ -> failwith "bad TOp.Array node")
         | (TOp.TryCatch _ | TOp.TryFinally _) -> (match tinst with [ty] ->  ty | _ -> failwith "bad TOp_try node")

diff --git a/src/fsharp/TcGlobals.fs b/src/fsharp/TcGlobals.fs
@@ -1303,7 +1303,7 @@ let mkTcGlobals (compilingFslib,sysCcu,ilg,fslibCcu,directoryToResolveRelativePa
                    nm, mkSysTyconRef sys nm, (fun _ -> ty)) 
 
         let entries2 =
-            [ "FSharpFunc`2",    fastFunc_tcr, (fun tinst -> mkFunTy (List.item tinst 0) (List.item tinst 1))
+            [ "FSharpFunc`2",    fastFunc_tcr, (fun tinst -> mkFunTy (List.item 0 tinst) (List.item 1 tinst))
               "Tuple`2",       ref_tuple2_tcr, decodeTupleTy tupInfoRef
               "Tuple`3",       ref_tuple3_tcr, decodeTupleTy tupInfoRef
               "Tuple`4",       ref_tuple4_tcr, decodeTupleTy tupInfoRef