Some more fleshing-out of the parser and better AST utils.

1 files changed, 6 insertions, 2 deletions

diff --git a/src/Main.hs b/src/Main.hs
index 226182a..d59181a 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -1,9 +1,13 @@
 module Main where
 
 import qualified Language.Fiddle.Tokenizer
+import qualified Language.Fiddle.Parser
+import Language.Fiddle.Ast
 import qualified Data.Text.IO
 import qualified System.Environment as System
 import Control.Monad (forM_)
+import Control.Monad.Writer
+import qualified Language.Fiddle.Parser
 
 main :: IO ()
 main = do
@@ -12,8 +16,8 @@ main = do
   case argv of
     [filePath] -> do
        text <- Data.Text.IO.readFile filePath
-       case Language.Fiddle.Tokenizer.tokenize filePath text of
+       case squeeze =<< Language.Fiddle.Parser.parseFiddleText filePath text of
          Left pe -> putStrLn $  "Parse Error: " ++ show pe
-         Right lst -> forM_ lst $ \(Language.Fiddle.Tokenizer.Token t _) -> print t
+         Right ast -> putStrLn "Parsing Okay"
 
     _ -> putStrLn "Wrong Args"