Merge remote-tracking branch 'origin/main' into feature/ast-optimizer

.gitignore

@@ -24,3 +24,4 @@ cabal.project.local~
 .stack-work
 glados
 .vscode
+output

LobsterLang/LobsterLang.cabal

@@ -28,6 +28,7 @@ library
       AST
       AstEval
       AstOptimizer
+      Compiler
       Parse
       Scope
       SExpr
@@ -42,6 +43,9 @@ library
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-export-lists -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints
   build-depends:
       base >=4.7 && <5
+    , binary
+    , bytestring
+    , utf8-string
   default-language: Haskell2010
 
 executable LobsterLang-exe
@@ -56,6 +60,9 @@ executable LobsterLang-exe
   build-depends:
       LobsterLang
     , base >=4.7 && <5
+    , binary
+    , bytestring
+    , utf8-string
   default-language: Haskell2010
 
 test-suite LobsterLang-test
@@ -64,6 +71,7 @@ test-suite LobsterLang-test
   other-modules:
       AstEvalSpec
       AstOptimizerSpec
+      CompilerSpec
       VmSpec
       Paths_LobsterLang
   autogen-modules:
@@ -74,5 +82,8 @@ test-suite LobsterLang-test
   build-depends:
       LobsterLang
     , base >=4.7 && <5
+    , binary
+    , bytestring
     , hspec
+    , utf8-string
   default-language: Haskell2010

LobsterLang/app/Main.hs

@@ -14,6 +14,7 @@ import System.Exit (exitWith, ExitCode (ExitFailure))
 import System.Environment (getArgs)
 import Control.Exception
 import SExpr (SExpr)
+-- import Compiler
 
 -- | Infinite loop until EOF from the user
 inputLoop :: [Scope.ScopeMb] -> IO ()
@@ -35,6 +36,8 @@ compileFile :: String -> IO ()
 compileFile s = case runParser parseLisp (0, 0) s of
         Left err -> print err >> exitWith (ExitFailure 84)
         Right (res, _, _) -> interpretateInfo res []
+        -- (Right (Just res), stack') -> let instructions = (astToInstructions (AST.Cond (Boolean True) (Value 1) (Just (AST.Call "CallHere" [(Value 0)])))) in showInstructions instructions >> writeCompiledInstructionsToFile "output" (compileInstructions instructions)
+
 
 checkArgs :: [String] -> IO ()
 checkArgs ("-i": _) = print "Launch Interpreter" >> inputLoop []

LobsterLang/package.yaml

@@ -21,6 +21,9 @@ description:         Please see the README on GitHub at <https://github.com/gith
 
 dependencies:
 - base >= 4.7 && < 5
+- bytestring
+- utf8-string
+- binary
 
 ghc-options:
 - -Wall