fix completions

.dir-locals.el

@@ -1,9 +1,11 @@
-((haskell-cabal-mode
+((haskell-mode
+  . ((eval
+      . (progn (add-to-list 'haskell-font-lock-quasi-quote-modes
+                            '("cps" . scheme-mode))
+               (add-to-list 'haskell-font-lock-quasi-quote-modes
+                            '("scm" . scheme-mode))))))
+ (haskell-cabal-mode
   . ((eval
       . (progn (defun apply-cabal-fmt-h ()
                  (haskell-mode-buffer-apply-command "cabal-fmt"))
-               (add-hook 'before-save-hook #'apply-cabal-fmt-h nil t)
+               (add-hook 'before-save-hook #'apply-cabal-fmt-h nil t))))))
-               (add-to-list 'haskell-font-lock-quasi-quote-modes
-                            '("cps" . scheme-mode))
-               (add-to-list 'haskell-font-lock-quasi-quote-modes
-                            '("scm" . scheme-mode)))))))

flake.nix

@@ -55,6 +55,11 @@
                 guile
                 rust-analyzer
                 wasmtime
+                # bashInteractive is necessary to work around an
+                # optparse-applicative issue
+                #
+                # https://github.com/pcapriotti/optparse-applicative/pull/408
+                bashInteractive
               ];
             };
           };

src/Gyehoek/Driver.hs

@@ -77,8 +77,6 @@ inspectWasm wat = do
   let wasmtools_cfg
         = proc "wasm-tools" ["print", "-pf", "--print-operand-stack"
                             ,"--color", "always", "-"]
-          -- & setStdin (byteStringInput . view lazy . encodeUtf8 $ wat)
-          -- & setStdout byteStringOutput
           & setStdin createPipe
           & setStdout createPipe
           & setStderr inherit
@@ -128,12 +126,12 @@ driver opts = do
     (eval >>> fmap writeObj      
          >>> T.unwords          
          >>> hPutStrLn FS.stdout)
-  dumpOrRun False (rt_is #CPS)
+  when (rt_is #CPS) do
-    (pure closedCps)
+    closedCps
-    (const $ pure ())
+      & CPS.evalProgram
-    (CPS.evalProgram >>> fmap writeObj      
+      & fmap writeObj      
-         >>> T.unwords          
+      & T.unwords          
-         >>> hPutStrLn FS.stdout)
+      & hPutStrLn FS.stdout
   dumpOrRun opts.inspectWasm (rt_is #Wasm)
     (lowerProgram cps)
     inspectWasm

src/Gyehoek/Options.hs

@@ -53,6 +53,7 @@ parser = do
     , short 'o'
     , metavar "FILE"
     , value "-"
+    , action "file"
     ]
   sourceFile <- argument str . fold $
     [ metavar "FILE"