Add bg_thread.dummy.sml to mock MLton threads in sml/nj

6 files changed, 15 insertions, 7 deletions

diff --git a/derivation.nix b/derivation.nix
index 19582948..e197372e 100644
--- a/derivation.nix
+++ b/derivation.nix
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
   #   rev = "e52ce9f542f64750941cfd84efdb6d993ee20ff0";
   #   sha256 = "19ba5n7g1dxy7q9949aakqplchsyzwrrnxv8v604vx5sg7fdfn3b";
   # };
-  src = nix-gitignore.gitignoreSource [] ./.;
+  src = ./.;
 
   buildInputs = [ openssl mlton mysql.connector-c postgresql sqlite automake autoconf libtool icu.dev openssl.dev];
 
diff --git a/src/bg_thread.dummy.sml b/src/bg_thread.dummy.sml
new file mode 100644
index 00000000..699fa741
--- /dev/null
+++ b/src/bg_thread.dummy.sml
@@ -0,0 +1,9 @@
+(*
+  Dummy implementation. Threading is only supported in MLton.
+  All other implementations just immediately run the background tasks
+*)
+structure BgThread:> BGTHREAD = struct
+  fun queueBgTask filename f = f ()
+  fun hasBgTasks () = false
+  fun runBgTaskForABit () = ()
+end
diff --git a/src/bg_thread.sml b/src/bg_thread.mlton.sml
index c5eb723c..91195940 100644
--- a/src/bg_thread.sml
+++ b/src/bg_thread.mlton.sml
@@ -6,8 +6,6 @@ structure BgThread:> BGTHREAD = struct
       open MLton
       open Itimer Signal Thread
 
-      val debug = LspSpec.debug
-
       val topLevel: Thread.Runnable.t option ref = ref NONE
       val currentRunningThreadIsForFileName: string ref = ref ""
       (* FIFO queue: Max one task per fileName *)
diff --git a/src/prefix.cm b/src/prefix.cm
index 2e71d073..eab0bf71 100644
--- a/src/prefix.cm
+++ b/src/prefix.cm
@@ -4,4 +4,6 @@ $/basis.cm
 $/smlnj-lib.cm
 $smlnj/ml-yacc/ml-yacc-lib.cm
 $/pp-lib.cm
+$(SRC)/bg_thread.sig
+$(SRC)/bg_thread.dummy.sml
 
diff --git a/src/prefix.mlb b/src/prefix.mlb
index 6a510481..13122fcf 100644
--- a/src/prefix.mlb
+++ b/src/prefix.mlb
@@ -3,5 +3,8 @@ local
   $(SML_LIB)/smlnj-lib/Util/smlnj-lib.mlb
   $(SML_LIB)/mlyacc-lib/mlyacc-lib.mlb
   $(SML_LIB)/smlnj-lib/PP/pp-lib.mlb
+  $(SML_LIB)/basis/mlton.mlb
+  $(SRC)/bg_thread.sig
+  $(SRC)/bg_thread.mlton.sml
 in
 
diff --git a/src/sources b/src/sources
index 686832cc..74171365 100644
--- a/src/sources
+++ b/src/sources
@@ -285,10 +285,6 @@ $(SRC)/fromjson.sml
 
 $(SRC)/lspspec.sml
 
-$(SML_LIB)/basis/mlton.mlb
-$(SRC)/bg_thread.sig
-$(SRC)/bg_thread.sml
-
 $(SRC)/lsp.sig
 $(SRC)/lsp.sml