wip

.github/workflows/ci.yml

@@ -35,7 +35,6 @@ jobs:
         os:
           - macos-latest
           - ubuntu-latest
-          - windows-latest
         ocaml-compiler:
           #- "4.11.0"
           - "4.14.1"

controller/jasminlsp.ml

@@ -4,14 +4,14 @@ open Controller
 let log msg = Format.eprintf "              [%d, %f] %s" (Unix.getpid ()) (Unix.gettimeofday ()) msg
 
 let loop () =
-  let rec loop (todo : LspManager.event Sel.todo) =
+  let rec loop (todo : LspManager.event Sel.Todo.t) =
     flush_all ();
     let ready, todo = Sel.pop todo in
     let new_events = LspManager.handle_event ready in
-    let todo = Sel.enqueue todo new_events in
+    let todo = Sel.Todo.add todo new_events in
     loop todo
   in
-  let todo = Sel.enqueue Sel.empty [LspManager.lsp] in
+  let todo = Sel.Todo.add Sel.Todo.empty [LspManager.lsp] in
   try loop todo
   with exn ->
     log @@ "Exception raised: " ^ (Printexc.to_string exn)

controller/lspManager.ml

@@ -15,10 +15,10 @@ type lsp_event =
 type event =
  | LspManagerEvent of lsp_event
 
-type events = event Sel.event list
+type events = event Sel.Event.t list
 
-let lsp : event Sel.event =
-  Sel.on_httpcle Unix.stdin (function
+let lsp : event Sel.Event.t =
+  Sel.On.httpcle Unix.stdin (function
     | Ok buff ->
       begin
         log "UI req ready";
@@ -30,9 +30,6 @@ let lsp : event Sel.event =
     | Error exn ->
         log @@ ("failed to read message: " ^ Printexc.to_string exn);
         exit 0)
-  |> fst
-  |> Sel.name "lsp"
-  |> Sel.make_recurring
 
 let output_json obj =
   let msg  = Yojson.Safe.pretty_to_string ~std:true obj in
@@ -230,8 +227,9 @@ let dispatch_notification =
 
 let handle_lsp_event = function
   | JsonRpc None ->
-      []
+      [lsp]
   | JsonRpc (Some rpc) ->
+    lsp ::
     match rpc with
     | Request req ->
         log @@ "ui request: " ^ req.method_;

controller/lspManager.mli

@@ -1,6 +1,6 @@
 type event
-type events = event Sel.event list
+type events = event Sel.Event.t list
 
-val lsp : event Sel.event
+val lsp : event Sel.Event.t
 
 val handle_event : event -> events

flake.nix

@@ -39,6 +39,7 @@
            jsonrpc
            lsp
            menhirLib
+           sel
          ]);
          propagatedBuildInputs = 
             pkgs.jasmin-compiler.propagatedBuildInputs;