Fable support

ncave · Nov 14, 2022 · 48821cf · 48821cf
1 parent e2f3a3e
commit 48821cf
Show file tree

Hide file tree

Showing 125 changed files with 5,466 additions and 294 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -75,6 +75,16 @@
             },
             "justMyCode": true,
             "enableStepFiltering": false,
+        },
+        {
+            "name": "FCS-Fable Test",
+            "type": "coreclr",
+            "request": "launch",
+            "program": "${workspaceFolder}/artifacts/bin/fcs-fable-test/Debug/net6.0/fcs-fable-test.dll",
+            "args": [],
+            "cwd": "${workspaceFolder}/fcs/fcs-fable/test",
+            "console": "internalConsole",
+            "stopAtEntry": false
         }
     ]
 }
diff --git a/buildtools/AssemblyCheck/AssemblyCheck.fsproj b/buildtools/AssemblyCheck/AssemblyCheck.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>
   </PropertyGroup>

diff --git a/buildtools/buildtools.targets b/buildtools/buildtools.targets
@@ -20,7 +20,7 @@
           BeforeTargets="CoreCompile">
 
     <PropertyGroup>
-        <FsLexPath Condition="'$(FsLexPath)' == ''">$(ArtifactsDir)\Bootstrap\fslex\fslex.dll</FsLexPath>
+        <FsLexPath Condition="'$(FsLexPath)' == ''">$(ArtifactsDir)\bin\fslex\Release\net6.0\fslex.dll</FsLexPath>
     </PropertyGroup>
 
     <!-- Create the output directory -->
@@ -44,7 +44,7 @@
           BeforeTargets="CoreCompile">
 
     <PropertyGroup>
-        <FsYaccPath Condition="'$(FsYaccPath)' == ''">$(ArtifactsDir)\Bootstrap\fsyacc\fsyacc.dll</FsYaccPath>
+        <FsYaccPath Condition="'$(FsYaccPath)' == ''">$(ArtifactsDir)\bin\fsyacc\Release\net6.0\fsyacc.dll</FsYaccPath>
     </PropertyGroup>
 
     <!-- Create the output directory -->

diff --git a/buildtools/fslex/fslex.fsproj b/buildtools/fslex/fslex.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <DefineConstants>INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants)</DefineConstants>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>

diff --git a/buildtools/fsyacc/fsyacc.fsproj b/buildtools/fsyacc/fsyacc.fsproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <DefineConstants>INTERNALIZED_FSLEXYACC_RUNTIME;$(DefineConstants)</DefineConstants>
     <DisableImplicitFSharpCoreReference>true</DisableImplicitFSharpCoreReference>
     <UseAppHost Condition="'$(DotNetBuildFromSource)' == 'true'">false</UseAppHost>

diff --git a/fcs/build.sh b/fcs/build.sh
@@ -0,0 +1,40 @@
+#!/usr/bin/env bash
+
+# cd to root
+cd $(dirname $0)/..
+
+# build fslex/fsyacc tools
+dotnet build -c Release buildtools
+# build FSharp.Compiler.Service (to make sure it's not broken)
+dotnet build -c Release src/Compiler
+
+# build FCS-Fable codegen
+cd fcs/fcs-fable/codegen
+dotnet build -c Release
+dotnet run -c Release -- ../../../src/Compiler/FSComp.txt FSComp.fs
+dotnet run -c Release -- ../../../src/Compiler/Interactive/FSIstrings.txt FSIstrings.fs
+
+# cleanup comments
+files="FSComp.fs FSIstrings.fs"
+for file in $files; do
+  echo "Delete comments in $file"
+  sed -i '1s/^\xEF\xBB\xBF//' $file # remove BOM
+  sed -i '/^ *\/\//d' $file # delete all comment lines
+done
+
+# replace all #line directives with comments
+files="lex.fs pplex.fs illex.fs ilpars.fs pars.fs pppars.fs"
+for file in $files; do
+  echo "Replace #line directives with comments in $file"
+  sed -i 's/^# [0-9]/\/\/\0/' $file # comment all #line directives
+  sed -i 's/^\(\/\/# [0-9]\{1,\} "\).*\/codegen\/\(\.\.\/\)*/\1/' $file # cleanup #line paths
+done
+
+# build FCS-Fable
+cd ..
+dotnet build -c Release
+
+# run some tests
+cd test
+npm test
+# npm run bench
diff --git a/fcs/fcs-fable/.gitignore b/fcs/fcs-fable/.gitignore
@@ -0,0 +1,3 @@
+# Codegen
+codegen/*.fs
+codegen/*.fsi