Merge pull request #433 from rojepp/integration_20151010

Integrate with fsharp/fsharp

Author: dsyme

.gitignore

@@ -94,21 +94,13 @@ ossreadme*.txt
 *.XML
 src/assemblyinfo/assemblyinfo.shared.fs
 *.csproj.user
-tests/fsharp/typecheck/sigs/*.diff
-tests/fsharp/typecheck/sigs/*.err
-tests/fsharp/typecheck/sigs/*.vsdiff
-tests/fsharp/typecheck/sigs/*.vserr
 src/fsharp/FSharp.LanguageService.Compiler/illex.*
 src/fsharp/FSharp.LanguageService.Compiler/ilpars.*
 src/fsharp/FSharp.LanguageService.Compiler/lex.*
 src/fsharp/FSharp.LanguageService.Compiler/pars.*
-tests/fsharp/typecheck/sigs/*.dll
-tests/fsharp/typecheck/sigs/*.exe
 vsintegration/src/unittests/Unittests.fsi
 tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.dll
 tests/fsharpqa/Source/CodeGen/EmittedIL/StaticInit/StaticInit_Module01.pdb
-tests/fsharp/typeProviders/helloWorld/bincompat1/
-tests/fsharp/typeProviders/helloWorld/bincompat2/
 tests/XFSharpQA_Failures.log.*
 vsintegration/src/vs/FsPkgs/FSharp.Project/FS/FSharp.ProjectSystem.FSharp.fsi
 vsintegration/src/vs/FsPkgs/FSharp.Project/FS/ctofiles/
@@ -118,6 +110,8 @@ packages
 FSharp.Compiler.Tools.Nuget/*.nupkg
 FSharp.Core.Nuget/*.nupkg
 *.csproj.user
+*.sln.DotSettings.user
+
 *.ide
 *.log
 *.jrs
@@ -126,5 +120,7 @@ FSharp.Core.Nuget/*.nupkg
 FSharp.Compiler.Tools.Nuget/*.nupkg
 FSharp.Core.Nuget/*.nupkg
 *.orig
+*.mdf
+*.ldf
 .paket/paket.exe
 paket-files

src/absil/ildiag.fsi

@@ -2,7 +2,7 @@
 
 /// Diagnostics from the AbsIL toolkit. You can reset the diagnostics 
 /// stream to point elsewhere, or turn it
-/// off altogether by setting it to 'None'.  The logging channel initally
+/// off altogether by setting it to 'None'.  The logging channel initially
 /// points to stderr.  All functions call flush() automatically.
 ///
 /// REVIEW: review if we should just switch to System.Diagnostics

src/absil/illib.fs

@@ -796,7 +796,7 @@ type LazyWithContext<'T,'ctxt> =
         match x.funcOrException with 
         | null -> x.value 
         | _ -> 
-            // Enter the lock in case another thread is in the process of evaluting the result
+            // Enter the lock in case another thread is in the process of evaluating the result
             System.Threading.Monitor.Enter(x);
             try 
                 x.UnsynchronizedForce(ctxt)

src/absil/ilread.fs

@@ -217,7 +217,6 @@ type MemoryMappedFile(hMap: MemoryMapping.HANDLE, start:nativeint) =
 
 
 #endif
-
 //---------------------------------------------------------------------
 // Read file from memory blocks 
 //---------------------------------------------------------------------

src/absil/ilread.fsi

@@ -41,7 +41,7 @@ type ILReaderOptions =
 val mkDefault :  ILGlobals -> ILReaderOptions
 
 // The non-memory resources (i.e. the file handle) associated with 
-// the read can be recovered by calling CloseILModuleReader.  Any reamining 
+// the read can be recovered by calling CloseILModuleReader.  Any remaining 
 // lazily-computed items in the metadata graph returned by MetadataOfILModuleReader 
 // will no longer be valid. 
 [<Sealed>]

src/absil/ilreflect.fs

@@ -347,11 +347,11 @@ let convTypeRefAux (cenv:cenv) (tref:ILTypeRef) =
             | None ->
                 let asmName    = convAssemblyRef asmref
                 FileSystem.AssemblyLoad(asmName)
-        let typT       = assembly.GetType(qualifiedName)
+        let typT = assembly.GetType(qualifiedName, throwOnError=true)
         typT |> nonNull "convTypeRefAux" 
     | ILScopeRef.Module _ 
     | ILScopeRef.Local _ ->
-        let typT = Type.GetType(qualifiedName,true) 
+        let typT = Type.GetType(qualifiedName, throwOnError=true) 
         typT |> nonNull "convTypeRefAux" 
 
 

src/absil/ilsupp.fs

@@ -1020,7 +1020,7 @@ type PdbDocumentWriter = { symDocWriter : ISymUnmanagedDocumentWriter }  (* poin
 type idd =
     { iddCharacteristics: int32;
       iddMajorVersion: int32; (* actually u16 in IMAGE_DEBUG_DIRECTORY *)
-      iddMinorVersion: int32; (* acutally u16 in IMAGE_DEBUG_DIRECTORY *)
+      iddMinorVersion: int32; (* actually u16 in IMAGE_DEBUG_DIRECTORY *)
       iddType: int32;
       iddData: byte[];}
 

src/absil/ilsupp.fsi

@@ -89,7 +89,7 @@ type PdbDocumentWriter
 type idd =
     { iddCharacteristics: int32;
       iddMajorVersion: int32; (* actually u16 in IMAGE_DEBUG_DIRECTORY *)
-      iddMinorVersion: int32; (* acutally u16 in IMAGE_DEBUG_DIRECTORY *)
+      iddMinorVersion: int32; (* actually u16 in IMAGE_DEBUG_DIRECTORY *)
       iddType: int32;
       iddData: byte[];}
 

src/absil/ilx.fsi

@@ -89,7 +89,7 @@ type IlxClosureApps =
     | Apps_app of ILType * IlxClosureApps 
     | Apps_done of ILType
 
-/// ILX extensions to the intruction set
+/// ILX extensions to the instruction set
 ///
 
 type IlxInstr = 

src/fsharp/CheckFormatStrings.fs

@@ -48,7 +48,7 @@ let newInfo ()=
     addZeros       = false
     precision      = false}
 
-let ParseFormatString (m: Range.range) g (source: string option) fmt bty cty dty = 
+let parseFormatStringInternal (m:Range.range) g (source: string option) fmt bty cty = 
     // Offset is used to adjust ranges depending on whether input string is regular, verbatim or triple-quote.
     // We construct a new 'fmt' string since the current 'fmt' string doesn't distinguish between "\n" and escaped "\\n".
     let (offset, fmt) = 
@@ -83,10 +83,7 @@ let ParseFormatString (m: Range.range) g (source: string option) fmt bty cty dty
                    acc |> List.map snd |> List.rev
                else  
                    failwithf "%s" <| FSComp.SR.forPositionalSpecifiersNotPermitted()
-          
-           let aty = List.foldBack (-->) argtys dty
-           let ety = mkTupledTy g argtys
-           aty,ety
+           argtys
        elif System.Char.IsSurrogatePair(fmt,i) then 
           parseLoop acc (i+2, relLine, relCol+2)
        else 
@@ -292,3 +289,18 @@ let ParseFormatString (m: Range.range) g (source: string option) fmt bty cty dty
 
     let results = parseLoop [] (0, 0, m.StartColumn)
     results, Seq.toList specifierLocations
+
+let ParseFormatString m g source fmt bty cty dty = 
+    let argtys,ranges = parseFormatStringInternal m g source fmt bty cty
+    let aty = List.foldBack (-->) argtys dty
+    let ety = mkTupledTy g argtys
+    (aty, ety),ranges
+
+let TryCountFormatStringArguments m g source fmt bty cty =
+    try
+        parseFormatStringInternal m g source fmt bty cty
+        |> fst
+        |> List.length
+        |> Some
+    with _ ->
+        None