Merge pull request #53 from nLatt/22-implement-an-interactive-mode-fo…

…r-the-scheme-interpreter

[Fix] add patterns matching

lib/Exec/InteractivePrompt.hs

@@ -1,6 +1,6 @@
 module Exec.InteractivePrompt where
 
-import Data.List ()
+import Data.List (isInfixOf)
 import Exec.Eval
 import Exec.Registry
 import Parsing.Ast (parseExprList)
@@ -15,33 +15,27 @@ import System.IO (hFlush, stdout)
 countChar :: Char -> String -> Int
 countChar char = length . filter (== char)
 
--- Function that checks the occurance between '(' and ')'.
--- Returns a boolean
-occurenceBrackets :: Int -> Int -> Bool
-occurenceBrackets num_open num_close = num_open == num_close && num_open /= 0
-
 recurse :: [String] -> Int -> Int -> IO String
 recurse inputs 0 close = print "Open with a bracket." >> getInput [] 0
+recurse inputs _ _
+  | "\ESC" `isInfixOf` last inputs = exitSuccess 
 recurse inputs open close
   | open == close = return $ concat inputs
   | otherwise = getInput inputs (open - close)
 
+printprompt :: Int -> IO ()
+printprompt 0 = putStr "> " >> hFlush stdout
+printprompt _ = putStr "  " >> hFlush stdout
+
 -- Recursive function that receives input
 -- Reads input, triggers program exit, terminates after good format, recursive if bad
 getInput :: [String] -> Int -> IO String
 getInput inputs openBrackets = do
-  if openBrackets == 0
-    then putStr "> "
-    else putStr "  "
-  hFlush stdout
+  printprompt openBrackets
   input <- getLine
-  if input == "\ESC"
-    then exitSuccess
-    else do
-      let num_open = countChar '(' input
-      let num_close = countChar ')' input
-
-      recurse (inputs <> [input ++ "\n"]) (openBrackets + num_open) num_close
+  let num_open = countChar '(' input
+  let num_close = countChar ')' input
+  recurse (inputs <> [input ++ "\n"]) (openBrackets + num_open) num_close
 
 loop :: Registry -> IO ()
 loop reg = do
@@ -60,9 +54,4 @@ interactiveMode = do
   -- Run
   loop emptyRegistry
 
-  return ()
-
--- Fonction main
---  Affiche entrée "input"bon au  format
--- get the return of the "checkBrackets" function
--- which gives the correct test format with true occurance '(' == ')'
+  return ()

lib/Exec/Main.hs

@@ -0,0 +1,46 @@
+module Main where
+
+-- Our modules
+import Parsing
+import Parsing.Token
+import Parsing.Cpt
+import Parsing.Ast
+import Parsing.Args
+import System.Console.GetOpt
+import Exec
+
+import System.Environment
+import System.Exit
+import Data.Maybe (fromMaybe)
+
+getFileName :: [String] -> Maybe FilePath -> String
+getFileName [] b = fromMaybe "stdin" b
+getFileName (x:xs) b = x
+
+runFile :: String -> IO ()
+runFile filename = do
+    -- Tokenize
+    tokens <- tokenizeFile filename
+
+    -- Parse CPT
+    let cpt = parseTokenList tokens
+
+    -- Parse AST
+    let ast = parseExprList cpt
+
+    -- Run
+    run ast
+
+    return ()
+
+
+main :: IO ()
+main = do
+    -- Parsing arguments
+    (res, fls) <- getArgs >>= parse
+
+    let fileName = getFileName fls (file res)
+    print ("Execute file: " ++  fileName)
+    if (==) fileName "stdin"
+        then exitSuccess -- interactive
+        else runFile fileName -- normal