Merge pull request #389 from dsyme/cleanup-oob

Integrate F# 4.x OOB cleanup

Author: fsgit

.gitignore

@@ -123,5 +123,7 @@ FSharp.Core.Nuget/*.nupkg
 *.jrs
 *.chk
 *.bak
+FSharp.Compiler.Tools.Nuget/*.nupkg
+FSharp.Core.Nuget/*.nupkg
 *.orig
 .paket/paket.exe

README.md

@@ -31,26 +31,3 @@ All AppVeyor builds are available using the NuGet feed: https://ci.appveyor.com/
 
 If using Paket, add the source at the top of `paket.dependencies`.
 
-```
-source https://www.nuget.org/api/v2
-source https://ci.appveyor.com/nuget/fsgit-fsharp-compiler-service
-```
-
-See the build history for a list of available versions: https://ci.appveyor.com/project/fsgit/fsharp-compiler-service/history
-
-Here are some options for specifying the dependency:
-
-```
-nuget FSharp.Compiler.Service
-nuget FSharp.Compiler.Service prerelease
-nuget FSharp.Compiler.Service 1.3.1.0
-nuget FSharp.Compiler.Service 1.3.1.1-b402
-```
-
-Dev Guide
-----------
-
-To integrate latest changes from http://github.com/fsharp/fsharp, use
-
-git remote add fsc https://github.com/fsharp/fsharp
-git pull fsc master

RELEASE_NOTES.md

@@ -1,3 +1,6 @@
+#### 1.4.0.3 - 
+* integrate Microsoft/visualfsharp OOB cleanup via fsharp/fsharp
+
 #### 1.4.0.2 - 
 * #387 - types and arrays in F# attribute contructor arguments  
 

build.fsx

@@ -56,18 +56,10 @@ Target "BuildVersion" (fun _ ->
 // Generate assembly info files with the right version & up-to-date information
 Target "AssemblyInfo" (fun _ ->
     let fileName = "src/assemblyinfo/assemblyinfo.shared.fs"
-    // add json info to the informational version
-    let iv = Text.StringBuilder() // json
-    iv.Appendf "{\\\"buildVersion\\\":\\\"%s\\\"" buildVersion
-    iv.Appendf ",\\\"buildDate\\\":\\\"%s\\\"" (buildDate.ToString "yyyy'-'MM'-'dd'T'HH':'mm':'sszzz")
-    if isAppVeyorBuild then
-        iv.Appendf ",\\\"gitCommit\\\":\\\"%s\\\"" AppVeyor.AppVeyorEnvironment.RepoCommit
-        iv.Appendf ",\\\"gitBranch\\\":\\\"%s\\\"" AppVeyor.AppVeyorEnvironment.RepoBranch
-    iv.Appendf "}"
     CreateFSharpAssemblyInfo fileName
           [ Attribute.Version assemblyVersion
             Attribute.FileVersion assemblyVersion
-            Attribute.InformationalVersion iv.String ]
+            Attribute.InformationalVersion assemblyVersion ]
 )
 
 // --------------------------------------------------------------------------------------

lib/bootstrap/4.0/FSharp.SRGen.targets

@@ -2,12 +2,17 @@
 
 module internal Microsoft.FSharp.Compiler.CommandLineMain
 
+open System
+open System.Diagnostics
+open System.IO
+open System.Reflection
+open System.Runtime.CompilerServices
 open Microsoft.FSharp.Compiler
 open Microsoft.FSharp.Compiler.AbstractIL.IL // runningOnMono 
 open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library
 open Microsoft.FSharp.Compiler.ErrorLogger
 open Microsoft.FSharp.Compiler.SimpleSourceCodeServices
-open System.Runtime.CompilerServices
+open Microsoft.FSharp.Compiler.Range
 
 type TypeInThisAssembly() = member x.Dummy = 1
 
@@ -16,10 +21,6 @@ let progress = ref false
 /// Implement the optional resident compilation service
 module FSharpResidentCompiler = 
 
-    open System
-    open System.Diagnostics
-    open System.IO
-    open System.Reflection
     open System.Runtime.Remoting.Channels
     open System.Runtime.Remoting
     open System.Runtime.Remoting.Lifetime
@@ -31,10 +32,10 @@ module FSharpResidentCompiler =
         let output = ResizeArray()
         let outWriter isOut = 
             { new TextWriter() with 
-                 member x.Write(c:char) = lock output (fun () -> output.Add (isOut, (try Some System.Console.ForegroundColor with _ -> None) ,c)) 
+                 member x.Write(c:char) = lock output (fun () -> output.Add (isOut, (try Some Console.ForegroundColor with _ -> None) ,c)) 
                  member x.Encoding = Encoding.UTF8 }
-        do System.Console.SetOut (outWriter true)
-        do System.Console.SetError (outWriter false)
+        do Console.SetOut (outWriter true)
+        do Console.SetError (outWriter false)
         member x.GetTextAndClear() = lock output (fun () -> let res = output.ToArray() in output.Clear(); res)
 
     /// The compilation server, which runs in the server process. Accessed by clients using .NET remoting.
@@ -235,7 +236,7 @@ module FSharpResidentCompiler =
                                      Console.ForegroundColor <- consoleColor; 
                              | None -> ()
                         with _ -> ()
-                        c |> (if isOut then System.Console.Out.Write else System.Console.Error.Write)
+                        c |> (if isOut then Console.Out.Write else Console.Error.Write)
                     Some exitCode
                 with err -> 
                    eprintfn "%s" (err.ToString())

lib/bootstrap/4.0/FsLexYacc.Build.Tasks.dll

@@ -215,22 +215,18 @@ module SHA1 =
         else k60to79 
 
 
-    type chan = SHABytes of byte[] 
-    type sha_instream = 
-        { stream: chan;
+    type SHAStream = 
+        { stream: byte[];
           mutable pos: int;
           mutable eof:  bool; }
 
-    let rot_left32 x n =  (x <<< n) ||| (x >>>& (32-n))
+    let rotLeft32 x n =  (x <<< n) ||| (x >>>& (32-n))
 
-    let inline sha_eof sha = sha.eof
-
-    (* padding and length (in bits!) recorded at end *)
-    let sha_after_eof sha  = 
+    
+    // padding and length (in bits!) recorded at end 
+    let shaAfterEof sha  = 
         let n = sha.pos
-        let len = 
-          (match sha.stream with
-          | SHABytes s -> s.Length)
+        let len = sha.stream.Length
         if n = len then 0x80
         else 
           let padded_len = (((len + 9 + 63) / 64) * 64) - 8
@@ -245,22 +241,21 @@ module SHA1 =
           elif (n &&& 63) = 63 then (sha.eof <- true; int32 (int64 len * int64 8) &&& 0xff)
           else 0x0
 
-    let sha_read8 sha = 
-        let b = 
-            match sha.stream with 
-            | SHABytes s -> if sha.pos >= s.Length then sha_after_eof sha else int32 s.[sha.pos]
-        sha.pos <- sha.pos + 1; 
+    let shaRead8 sha = 
+        let s = sha.stream 
+        let b = if sha.pos >= s.Length then shaAfterEof sha else int32 s.[sha.pos]
+        sha.pos <- sha.pos + 1
         b
 
-    let sha_read32 sha  = 
-        let b0 = sha_read8 sha
-        let b1 = sha_read8 sha
-        let b2 = sha_read8 sha
-        let b3 = sha_read8 sha
+    let shaRead32 sha  = 
+        let b0 = shaRead8 sha
+        let b1 = shaRead8 sha
+        let b2 = shaRead8 sha
+        let b3 = shaRead8 sha
         let res = (b0 <<< 24) ||| (b1 <<< 16) ||| (b2 <<< 8) ||| b3
         res
 
-    let sha1_hash sha = 
+    let sha1Hash sha = 
         let mutable h0 = 0x67452301
         let mutable h1 = 0xEFCDAB89
         let mutable h2 = 0x98BADCFE
@@ -272,21 +267,21 @@ module SHA1 =
         let mutable d = 0
         let mutable e = 0
         let w = Array.create 80 0x00
-        while (not (sha_eof sha)) do
+        while (not sha.eof) do
             for i = 0 to 15 do
-                w.[i] <- sha_read32 sha
+                w.[i] <- shaRead32 sha
             for t = 16 to 79 do
-                w.[t] <- rot_left32 (w.[t-3] ^^^ w.[t-8] ^^^ w.[t-14] ^^^ w.[t-16]) 1
+                w.[t] <- rotLeft32 (w.[t-3] ^^^ w.[t-8] ^^^ w.[t-14] ^^^ w.[t-16]) 1
             a <- h0 
             b <- h1
             c <- h2
             d <- h3
             e <- h4
             for t = 0 to 79 do
-                let temp = (rot_left32 a 5) + f(t,b,c,d) + e + w.[t] + k(t)
+                let temp = (rotLeft32 a 5) + f(t,b,c,d) + e + w.[t] + k(t)
                 e <- d
                 d <- c
-                c <- rot_left32 b 30
+                c <- rotLeft32 b 30
                 b <- a
                 a <- temp
             h0 <- h0 + a
@@ -297,7 +292,7 @@ module SHA1 =
         h0,h1,h2,h3,h4
 
     let sha1HashBytes s = 
-        let (_h0,_h1,_h2,h3,h4) = sha1_hash { stream = SHABytes s; pos = 0; eof = false }   // the result of the SHA algorithm is stored in registers 3 and 4
+        let (_h0,_h1,_h2,h3,h4) = sha1Hash { stream = s; pos = 0; eof = false }   // the result of the SHA algorithm is stored in registers 3 and 4
         Array.map byte [|  b0 h4; b1 h4; b2 h4; b3 h4; b0 h3; b1 h3; b2 h3; b3 h3; |]
 
 

samples/FscExe/FscMain.fs

@@ -12,7 +12,7 @@ open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics
 open Microsoft.FSharp.Compiler.AbstractIL.Extensions.ILX.Types 
 open Microsoft.FSharp.Compiler.AbstractIL.IL 
 
-// set to the proper value at build.fs (BuildFrameworkTcImports)
+// set to the proper value at CompileOps.fs (BuildFrameworkTcImports)
 let parseILGlobals = ref EcmaILGlobals
 
 // -------------------------------------------------------------------- 

src/absil/il.fs

@@ -472,6 +472,7 @@ module Dictionary =
 
 // FUTURE CLEANUP: remove this adhoc collection
 type Hashset<'T> = Dictionary<'T,int>
+
 [<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
 module Hashset = 
     let create (n:int) = new Hashset<'T>(n, HashIdentity.Structural)
@@ -505,6 +506,28 @@ type ResultOrException<'TResult> =
     | Result of 'TResult
     | Exception of System.Exception
 
+[<CompilationRepresentation(CompilationRepresentationFlags.ModuleSuffix)>]
+module ResultOrException = 
+
+    let success a = Result a
+    let raze (b:exn) = Exception b
+
+    // map
+    let (|?>) res f = 
+        match res with 
+        | Result x -> Result(f x )
+        | Exception err -> Exception err
+  
+    let ForceRaise res = 
+        match res with 
+        | Result x -> x
+        | Exception err -> raise err
+
+    let otherwise f x =
+        match x with 
+        | Result x -> success x
+        | Exception _err -> f()
+
 
 //-------------------------------------------------------------------------
 // Library: extensions to flat list  (immutable arrays)
@@ -1088,4 +1111,4 @@ module Shim =
                 System.Text.Encoding.GetEncoding(n)
 #endif                
 
-    let mutable FileSystem = DefaultFileSystem() :> IFileSystem 
+    let mutable FileSystem = DefaultFileSystem() :> IFileSystem