Dev to main

app/Args.hs

@@ -0,0 +1,61 @@
+{-
+-- EPITECH PROJECT, 2023
+-- Koaky
+-- File description:
+-- args
+-}
+
+
+module Args
+    (
+        Action(..),
+        Args(..),
+        RunOpt(..),
+        parseArgs,
+        printHelp
+    ) where
+
+data Action = ShowHelp | ShowVersion | Run
+data RunOpt = RunStdin | RunFile
+
+data Args = Args {
+    action :: Action,
+    runOpt :: RunOpt,
+    filePath :: String
+}
+
+parseArgs' :: [String] -> Args -> Either Args String
+parseArgs' [] args =
+    Left args
+parseArgs' ("--help":xs) args =
+    parseArgs' xs (args {action = ShowHelp})
+parseArgs' ("-h":xs) args =
+    parseArgs' xs (args {action = ShowHelp})
+parseArgs' ("--version":xs) args =
+    parseArgs' xs (args {action = ShowVersion})
+parseArgs' ("-v":xs) args =
+    parseArgs' xs (args {action = ShowVersion})
+parseArgs' ("-f":f:xs) args =
+    parseArgs' xs (args {action = Run, runOpt = RunFile, filePath = f})
+parseArgs' ["-f"] _ =
+    Right "No file specified"
+parseArgs' ("-":xs) args =
+    parseArgs' xs (args {action = Run, runOpt = RunStdin})
+parseArgs' (x:_) _ =
+    Right ("Unknown option: " ++ x)
+
+parseArgs :: [String] -> Either Args String
+parseArgs args =
+    parseArgs' args (Args {action = Run, runOpt = RunStdin, filePath = ""})
+
+printHelp :: IO ()
+printHelp = putStr help
+    where
+        line1 = "Usage: koaky [OPTION]\n\nInterpret Lisp\n"
+        line2a = "With no options, koaky reads from standard input.\n\n"
+        line3 = "Options:\n"
+        line4 = "\t-h, --help\n\t\tDisplay this help and exit\n"
+        line5 = "\t-v, --version\n\t\tOutput version information and exit\n"
+        line6 = "\t-f FILE, --file FILE\n\t\tRead FILE and Interpret it\n"
+        line7 = "\t-\n\t\tRead from standard input and Interpret it\n"
+        help = line1 ++ line2a ++ line3 ++ line4 ++ line5 ++ line6 ++ line7

app/Main.hs

@@ -5,35 +5,17 @@
 -- Main
 -}
 
-import Computing.ComputeAST
-import Parsing.Parser
-import Types
-import System.IO
-
-printErrors :: (Env) -> IO ()
-printErrors (Env defines_ []) =
-  printErrors (Env defines_ ["Unable to compute"])
-printErrors (Env defines_ errors_) =
-  mapM_ putStrLn errors_ >> handleInput (Env defines_ [])
-
-checkComputing :: (Env, Maybe Result) -> IO ()
-checkComputing (env, Nothing) = printErrors env
-checkComputing (env, Just result) = putStrLn (show result) >> handleInput env
-
-checkParsing :: Maybe (Tree, String) -> Env -> IO ()
-checkParsing Nothing _ = return ()
-checkParsing (Just (tree, _)) env = checkComputing (computeAST env tree)
-
-checkInput :: String -> Env -> IO ()
-checkInput ":q" _ = return ()
-checkInput input env = checkParsing (runParser (parseTree) input) env
-
-checkEOF :: Env -> Bool -> IO ()
-checkEOF _ True = return ()
-checkEOF env False = getLine >>= (\x -> checkInput x env)
-
-handleInput :: Env -> IO ()
-handleInput env = isEOF >>= (\x -> checkEOF env x)
+import System.Environment (getArgs)
+import Args
+import Run
+import Version
+
+dispatchAction :: Either Args String -> IO ()
+dispatchAction (Right error_) = putStrLn error_
+dispatchAction (Left (Args ShowHelp _ _)) = printHelp
+dispatchAction (Left (Args ShowVersion _ _)) = printVersion
+dispatchAction (Left (Args Run RunFile f)) = runFile f
+dispatchAction (Left (Args Run RunStdin _)) = runStdin
 
 main :: IO ()
-main = handleInput (Env [] [])
+main = getArgs >>= (dispatchAction . parseArgs)

app/Run.hs

@@ -0,0 +1,65 @@
+{-
+-- EPITECH PROJECT, 2023
+-- Koaky
+-- File description:
+-- run
+-}
+
+module Run
+    (
+        runStdin,
+        runFile
+    ) where
+
+import Computing.ComputeAST
+import Parsing.Parser
+import Types
+import System.IO
+
+data HHHandle = HHHandle Handle Bool
+
+printErrors :: HHHandle -> Env -> IO ()
+printErrors hand (Env defines_ [] funcs_) =
+  printErrors hand (Env defines_ ["Unable to compute"] funcs_)
+printErrors hand (Env defines_ errors_ funcs_) =
+  mapM_ putStrLn errors_ >> handleInput hand (Env defines_ [] funcs_) []
+
+checkComputing :: HHHandle -> (Env, Result) -> IO ()
+checkComputing hand (env, Right _) = printErrors hand env
+checkComputing hand (env, Left Nothing) = handleInput hand env []
+checkComputing hand (env, Left (Just result)) =
+    print result >> handleInput hand env []
+
+checkParsing :: HHHandle -> String -> Maybe (Tree, String) -> Env -> IO ()
+checkParsing hand str Nothing env = handleInput hand env str
+checkParsing hand _ (Just (tree, _)) env =
+    checkComputing hand (computeAST env tree)
+
+checkInput :: HHHandle -> String -> Env -> IO ()
+checkInput _ ":q" _ = return ()
+checkInput hand input env =
+  checkParsing hand input (runParser (parseTree) input) env
+
+checkEOF :: HHHandle -> Env -> String -> Bool -> IO ()
+checkEOF _ _ _ True = return ()
+checkEOF (HHHandle ff shouldClosee) env prevStr False = hGetLine ff >>=
+    (\x -> checkInput (HHHandle ff shouldClosee) (prevStr ++ x) env)
+
+handleInput :: HHHandle -> Env -> String -> IO ()
+handleInput (HHHandle ff shouldClosee) env prevStr =
+    hIsEOF ff >>= (\x -> checkEOF (HHHandle ff shouldClosee) env prevStr x)
+
+runStdin :: IO ()
+runStdin = runFileHandle stdin False
+
+runFile :: String -> IO ()
+runFile filePath = openFile filePath ReadMode >>= \x -> runFileHandle x True
+
+onEnd :: HHHandle -> IO ()
+onEnd (HHHandle ff True) = hClose ff
+onEnd _ = return ()
+
+runFileHandle :: Handle -> Bool -> IO ()
+runFileHandle ff shouldClosee =
+    handleInput (HHHandle ff shouldClosee) (Env [] [] []) [] >>
+    onEnd (HHHandle ff shouldClosee)

app/Version.hs

@@ -0,0 +1,15 @@
+{-
+-- EPITECH PROJECT, 2023
+-- koaky
+-- File description:
+-- version
+-}
+
+module Version
+    ( printVersion
+    ) where
+
+import KoakyLibVersion
+
+printVersion :: IO ()
+printVersion = putStrLn koakyLibVersion

koaky.cabal

@@ -1,6 +1,6 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.35.2.
+-- This file has been generated from package.yaml by hpack version 0.36.0.
 --
 -- see: https://github.com/sol/hpack
 
@@ -27,11 +27,15 @@ library
   exposed-modules:
       AST
       Computing.ComputeAST
-      Computing.ComputeDeepLists
-      Computing.ComputeLists
       Computing.Defines
       Computing.Errors
       Computing.Functions
+      Computing.ListContainList
+      Computing.Operators.Assert
+      Computing.Operators.Calculate
+      Computing.Operators.EvaluateSymbol
+      Computing.ReplaceFunctionParams
+      KoakyLibVersion
       Parsing.Parser
       Types
   other-modules:
@@ -46,6 +50,9 @@ library
 executable koaky-exe
   main-is: Main.hs
   other-modules:
+      Args
+      Run
+      Version
       Paths_koaky
   hs-source-dirs:
       app