Provide function to go back from a deBruijn term to an AST

1 files changed, 18 insertions, 10 deletions

diff --git a/lambda-calcul/haskell/src/Minilang/IO.hs b/lambda-calcul/haskell/src/Minilang/IO.hs
index a045647..b2b3dcc 100644
--- a/lambda-calcul/haskell/src/Minilang/IO.hs
+++ b/lambda-calcul/haskell/src/Minilang/IO.hs
@@ -7,8 +7,8 @@ import Data.Text.Encoding
     encodeUtf8,
   )
 import Data.Text.Encoding.Error (lenientDecode)
-import Minilang.Lambda.DeBruijn (eval, toDeBruijn)
-import Minilang.Lambda.Parser (desugar, parse, pretty)
+import Minilang.Lambda.DeBruijn (eval, fromDeBruijn, toDeBruijn)
+import Minilang.Lambda.Parser (desugar, parse, pretty, resugar)
 import System.IO (Handle)
 
 -- | Read a "program" from @hin@ handle, evaluate it and dump the result
@@ -17,11 +17,19 @@ runEval :: Handle -> Handle -> IO ()
 runEval hin hout = do
   programText <- decodeUtf8With lenientDecode <$> BS.hGetContents hin
   let parsed = parse programText
-  case parsed of
-    Left err -> print err
-    Right ast -> do
-      putStrLn $ Text.unpack $ "Evaluating " <> pretty ast
-      let termy = desugar ast
-      putStrLn $ "Desugared to " <> show termy
-      let term = toDeBruijn termy
-      print $ eval term
+  let result =
+        case parsed of
+          Left err -> Text.pack $ show err
+          Right ast ->
+            let evaluate =
+                  pretty
+                    . resugar
+                    . fromDeBruijn
+                    . eval
+                    . toDeBruijn
+                    . desugar
+             in evaluate ast
+
+  BS.hPut
+    hout
+    (encodeUtf8 result)