[WIP] Fable support

Author: ncave

.vscode/launch.json

@@ -0,0 +1,21 @@
+{
+    // Use IntelliSense to learn about possible Node.js debug attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "node2",
+            "request": "launch",
+            "name": "Launch Program",
+            "program": "${workspaceRoot}/src/fsharp/Fable.FCS/out/Fable.FCS/project.js",
+            "cwd": "${workspaceRoot}"
+        },
+        {
+            "type": "node2",
+            "request": "attach",
+            "name": "Attach to Process",
+            "port": 5858
+        }
+    ]
+}

Export.FCS.sln

@@ -0,0 +1,27 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "FSharp.Compiler.Service", "src\fsharp\FSharp.Compiler.Service\FSharp.Compiler.Service.fsproj", "{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}"
+EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Export.FCS", "src\fsharp\Export.FCS\Export.FCS.fsproj", "{C89727FE-5D40-4DE2-B751-753D75C86E4C}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{2E4D67B4-522D-4CF7-97E4-BA940F0B18F3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C89727FE-5D40-4DE2-B751-753D75C86E4C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C89727FE-5D40-4DE2-B751-753D75C86E4C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C89727FE-5D40-4DE2-B751-753D75C86E4C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C89727FE-5D40-4DE2-B751-753D75C86E4C}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal

build.fsx

@@ -272,14 +272,27 @@ Target "CodeGen.NetCore" (fun _ ->
     let fsLex fsl out = runInDir (toolDir + "fslex.exe") "%s --unicode %s -o %s" fsl lexArgs out
     let fsYacc fsy out m o = runInDir (toolDir + "fsyacc.exe") "%s %s %s %s %s -o %s" fsy lexArgs yaccArgs m o out
 
+#if FABLE_COMPILER
+    // until a more recent version of fssrgen is released, building from source
+    runInDir "dotnet" "run -c Release -p /Projects/FsSrGen/src/dotnet-fssrgen ../FSComp.txt ./FSComp.fs"
+    runInDir "dotnet" "run -c Release -p /Projects/FsSrGen/src/dotnet-fssrgen ../fsi/FSIstrings.txt ./FSIstrings.fs"
+#else
     runInDir "dotnet" "fssrgen ../FSComp.txt ./FSComp.fs ./FSComp.resx"
     runInDir "dotnet" "fssrgen ../fsi/FSIstrings.txt ./FSIstrings.fs ./FSIstrings.resx"
+#endif
     fsLex "../lex.fsl" "lex.fs"
     fsLex "../pplex.fsl" "pplex.fs"
     fsLex "../../absil/illex.fsl" "illex.fs"
     fsYacc "../../absil/ilpars.fsy" "ilpars.fs" module1 open1
     fsYacc "../pars.fsy" "pars.fs" module2 open2
     fsYacc "../pppars.fsy" "pppars.fs" module3 open3
+
+#if FABLE_COMPILER
+    // comments the #line directive as it is not supported by Fable
+    ["lex.fs"; "pplex.fs"; "illex.fs"; "ilpars.fs"; "pars.fs"; "pppars.fs"]
+    |> Seq.map (fun fileName -> IO.Path.Combine (workDir, fileName))
+    |> RegexReplaceInFilesWithEncoding @"# (?=\d)" "//# " Text.Encoding.UTF8
+#endif
 )
 
 Target "Build.NetCore" (fun _ ->

global.json

@@ -1,3 +1,6 @@
 {
-  "projects": [ "src/fsharp", "tests" ]
+  "projects": [ "src/fsharp", "tests" ],
+  "sdk": {
+    "version": "1.0.0-preview2-003131"
+  }
 }

src/absil/il.fs

@@ -8,14 +8,18 @@ module (*internal*) Microsoft.FSharp.Compiler.AbstractIL.IL
 
 
 open Internal.Utilities
+#if FABLE_COMPILER
+open Microsoft.FSharp.Collections
+open Microsoft.FSharp.Core
+#endif
 open Microsoft.FSharp.Compiler.AbstractIL
 open Microsoft.FSharp.Compiler.AbstractIL.Diagnostics
 open Microsoft.FSharp.Compiler.AbstractIL.Internal
 open Microsoft.FSharp.Compiler.AbstractIL.Internal.Library
 open System.Collections
 open System.Collections.Generic
 open System.Collections.Concurrent
- 
+
 let logging = false 
 
 let runningOnMono = 
@@ -77,21 +81,21 @@ let rec splitNamespaceAux (nm:string) =
 
 /// Global State. All namespace splits ever seen
 // ++GLOBAL MUTABLE STATE
+#if FABLE_COMPILER
+let memoizeNamespaceTable = new Dictionary<string,string list>()
+let memoizeNamespaceRightTable = new Dictionary<string,string option * string>()
+let memoizeNamespaceArrayTable = Dictionary<string,string[]>()
+#else
 let memoizeNamespaceTable = new ConcurrentDictionary<string,string list>()
-
-//  ++GLOBAL MUTABLE STATE
 let memoizeNamespaceRightTable = new ConcurrentDictionary<string,string option * string>()
-
+let memoizeNamespaceArrayTable = ConcurrentDictionary<string,string[]>()
+#endif
 
 let splitNamespace nm =
     memoizeNamespaceTable.GetOrAdd(nm, splitNamespaceAux)
 
 let splitNamespaceMemoized nm = splitNamespace nm
 
-// ++GLOBAL MUTABLE STATE
-let memoizeNamespaceArrayTable = 
-    Concurrent.ConcurrentDictionary<string,string[]>()
-
 let splitNamespaceToArray nm =
     memoizeNamespaceArrayTable.GetOrAdd(nm, fun nm -> 
         let x = Array.ofList (splitNamespace nm)
@@ -373,6 +377,7 @@ type ILAssemblyRef(data)  =
               assemRefVersion=version;
               assemRefLocale=locale; }
 
+#if !FABLE_COMPILER
     static member FromAssemblyName (aname:System.Reflection.AssemblyName) =
         let locale = None
         //match aname.CultureInfo with 
@@ -395,13 +400,12 @@ type ILAssemblyRef(data)  =
         let retargetable = aname.Flags = System.Reflection.AssemblyNameFlags.Retargetable
 
         ILAssemblyRef.Create(aname.Name,None,publicKey,retargetable,version,locale)
- 
-
+ #endif
 
     member aref.QualifiedName = 
         let b = new System.Text.StringBuilder(100)
         let add (s:string) = (b.Append(s) |> ignore)
-        let addC (s:char) = (b.Append(s) |> ignore)
+        let addC (s:char) = (b.Append(string s) |> ignore)
         add(aref.Name);
         match aref.Version with 
         | None -> ()
@@ -468,7 +472,7 @@ type ILScopeRef =
     member scoref.QualifiedName = 
         match scoref with 
         | ILScopeRef.Local -> ""
-        | ILScopeRef.Module mref -> "module "^mref.Name
+        | ILScopeRef.Module mref -> "module "+mref.Name
         | ILScopeRef.Assembly aref when aref.Name = "mscorlib" -> ""
         | ILScopeRef.Assembly aref -> aref.QualifiedName
 
@@ -532,7 +536,6 @@ type ILBoxity =
   | AsObject 
   | AsValue
 
-
 // IL type references have a pre-computed hash code to enable quick lookup tables during binary generation.
 [<CustomEquality; CustomComparison>]
 type ILTypeRef = 
@@ -568,12 +571,14 @@ type ILTypeRef =
         | _ -> ILType.Boxed tspec
 
     override x.GetHashCode() = x.hashCode
-    override x.Equals(yobj) = 
-         let y = (yobj :?> ILTypeRef) 
-         (x.ApproxId = y.ApproxId) && 
-         (x.Scope = y.Scope) && 
-         (x.Name = y.Name) && 
-         (x.Enclosing = y.Enclosing)
+    override x.Equals(yobj:obj) = 
+        match yobj with 
+        | :? ILTypeRef as y ->
+            (x.ApproxId = y.ApproxId) && 
+            (x.Scope = y.Scope) && 
+            (x.Name = y.Name) && 
+            (x.Enclosing = y.Enclosing)
+        |   _ -> false
     interface System.IComparable with
         override x.CompareTo(yobj) = 
             let y = (yobj :?> ILTypeRef) 
@@ -1365,10 +1370,10 @@ type ILMethodDef =
     member x.IsNonVirtualInstance = match x.mdKind with | MethodKind.NonVirtual -> true | _ -> false
     member x.IsVirtual            = match x.mdKind with | MethodKind.Virtual _  -> true | _ -> false
 
-    member x.IsFinal                = match x.mdKind with | MethodKind.Virtual v -> v.IsFinal    | _ -> invalidOp "not virtual"
-    member x.IsNewSlot              = match x.mdKind with | MethodKind.Virtual v -> v.IsNewSlot  | _ -> invalidOp "not virtual"
-    member x.IsCheckAccessOnOverride= match x.mdKind with | MethodKind.Virtual v -> v.IsCheckAccessOnOverride   | _ -> invalidOp "not virtual"
-    member x.IsAbstract             = match x.mdKind with | MethodKind.Virtual v -> v.IsAbstract | _ -> invalidOp "not virtual"
+    member x.IsFinal                = match x.mdKind with | MethodKind.Virtual v -> v.IsFinal    | _ -> false //invalidOp "not virtual"
+    member x.IsNewSlot              = match x.mdKind with | MethodKind.Virtual v -> v.IsNewSlot  | _ -> false //invalidOp "not virtual"
+    member x.IsCheckAccessOnOverride= match x.mdKind with | MethodKind.Virtual v -> v.IsCheckAccessOnOverride   | _ -> false //invalidOp "not virtual"
+    member x.IsAbstract             = match x.mdKind with | MethodKind.Virtual v -> v.IsAbstract | _ -> false //invalidOp "not virtual"
 
     member md.CallingSignature =  mkILCallSig (md.CallingConv,md.ParameterTypes,md.Return.Type)
 
@@ -1552,7 +1557,7 @@ and [<Sealed>] ILTypeDefs(f : unit -> (string list * string * ILAttributes * Laz
     let mutable array = InlineDelayInit<_>(f)
     let mutable dict = InlineDelayInit<_>(fun () -> 
             let arr = array.Value
-            let t = Dictionary<_,_>(HashIdentity.Structural)
+            let t = Dictionary<_,_>(3, HashIdentity.Structural)
             for (nsp, nm, _attr, ltd) in arr do 
                 let key = nsp, nm
                 t.[key] <- ltd
@@ -3661,7 +3666,11 @@ type ILTypeSigParser(tstring : string) =
                 // fetch the arity
                 let arity = 
                     while (int(here()) >= (int('0'))) && (int(here()) <= ((int('9')))) && (int(peek()) >= (int('0'))) && (int(peek()) <= ((int('9')))) do step()
+#if FABLE_COMPILER
+                    System.Convert.ToInt32(take())
+#else
                     System.Int32.Parse(take())
+#endif
                 // skip the '['
                 drop()
                 // get the specializations
@@ -3699,7 +3708,11 @@ type ILTypeSigParser(tstring : string) =
                       yield grabScopeComponent() // culture
                       yield grabScopeComponent() // public key token
                     ] |> String.concat ","
+#if FABLE_COMPILER
+                ILScopeRef.Assembly(mkSimpleAssRef scope)
+#else
                 ILScopeRef.Assembly(ILAssemblyRef.FromAssemblyName(System.Reflection.AssemblyName(scope)))        
+#endif
             else
                 ILScopeRef.Local
 
@@ -3844,7 +3857,11 @@ let decodeILAttribData ilg (ca: ILAttribute) =
                     pieces.[0], None
             let scoref = 
                 match rest with 
+#if FABLE_COMPILER
+                | Some aname -> ILScopeRef.Assembly(mkSimpleAssRef aname)
+#else
                 | Some aname -> ILScopeRef.Assembly(ILAssemblyRef.FromAssemblyName(System.Reflection.AssemblyName(aname)))        
+#endif
                 | None -> ilg.traits.ScopeRef
 
             let tref = mkILTyRef (scoref,unqualified_tname)
@@ -4105,13 +4122,18 @@ let parseILVersion (vstr : string) =
         // Set the revision number to number of seconds today / 2
         versionComponents.[3] <- defaultRevision.ToString() ;
         vstr <- System.String.Join(".",versionComponents) ;
-        
+    
+#if FABLE_COMPILER
+    let parts = vstr.Split([|'.'|])
+    let versions = Array.append (Array.map uint16 parts) [|0us;0us;0us;0us|]
+    (versions.[0], versions.[1], versions.[2],versions.[3])
+#else
     let version = System.Version(vstr)
     let zero32 n = if n < 0 then 0us else uint16(n)
     // since the minor revision will be -1 if none is specified, we need to truncate to 0 to not break existing code
     let minorRevision = if version.Revision = -1 then 0us else uint16(version.MinorRevision)   
     (zero32 version.Major, zero32 version.Minor, zero32 version.Build, minorRevision);;
-
+#endif
 
 let compareILVersions (a1,a2,a3,a4) ((b1,b2,b3,b4) : ILVersionInfo) = 
     let c = compare a1 b1

src/absil/il.fsi

@@ -99,7 +99,9 @@ type ILVersionInfo = uint16 * uint16 * uint16 * uint16
 [<Sealed>]
 type ILAssemblyRef =
     static member Create : name: string * hash: byte[] option * publicKey: PublicKey option * retargetable: bool * version: ILVersionInfo option * locale: string option -> ILAssemblyRef
+#if !FABLE_COMPILER
     static member FromAssemblyName : System.Reflection.AssemblyName -> ILAssemblyRef
+#endif
     member Name: string;
     /// The fully qualified name of the assembly reference, e.g. mscorlib, Version=1.0.3705 etc.
     member QualifiedName: string; 

src/absil/ildiag.fs

@@ -6,6 +6,12 @@ module internal Microsoft.FSharp.Compiler.AbstractIL.Diagnostics
 
 open Internal.Utilities
 
+#if FABLE_COMPILER
+let dprintf fmt = printf fmt
+let dprintfn fmt = printfn fmt
+let dprintn s = printfn "%s" s
+#else
+
 let diagnosticsLog = ref (Some stdout)
 
 let setDiagnosticsChannel s = diagnosticsLog := s 
@@ -21,3 +27,4 @@ let dprintf (fmt: Format<_,_,_,_>) =
 let dprintfn (fmt: Format<_,_,_,_>) = 
     Printf.kfprintf dflushn (match !diagnosticsLog with None -> System.IO.TextWriter.Null | Some d -> d) fmt
 
+#endif

src/absil/ildiag.fsi

@@ -8,10 +8,12 @@
 /// REVIEW: review if we should just switch to System.Diagnostics
 module internal Microsoft.FSharp.Compiler.AbstractIL.Diagnostics
 
-open System.IO
 open Microsoft.FSharp.Core.Printf
+#if !FABLE_COMPILER
+open System.IO
 
 val public setDiagnosticsChannel: TextWriter option -> unit 
+#endif
 
 val public dprintfn: TextWriterFormat<'a> -> 'a 
 val public dprintf: TextWriterFormat<'a> -> 'a