Add for loops

[kaleidoscope-hs-old.git] / AST.hs

diff --git a/AST.hs b/AST.hs
index 6b9928d5b13fa0d67c848b8c3c0e446c2babb4f4..e5ea72ad3e059e33b71cb387b82a100b4c207a3a 100644 (file)
--- a/AST.hs
+++ b/AST.hs
@@ -2,7 +2,7 @@ module AST where
 
 import Data.Char
 import Text.Read
 
 import Data.Char
 import Text.Read

-import Text.ParserCombinators.ReadP hiding ((+++), choice)
+import Text.ParserCombinators.ReadP hiding ((+++), (<++), choice)

 
 newtype Program = Program [AST]
   deriving Show
 
 newtype Program = Program [AST]
   deriving Show


@@ -18,29 +18,34 @@ instance Read Program where
     return asts
 
 data AST = Function String [String] Expr
     return asts
 
 data AST = Function String [String] Expr

+         | Extern String [String]

          | Eval Expr
   deriving Show
          | Eval Expr
   deriving Show

-data Expr = Num Float
+data Expr = Num Double

           | BinOp BinOpType Expr Expr
           | Var String
           | Call String [Expr]
           | If Expr Expr Expr
           | BinOp BinOpType Expr Expr
           | Var String
           | Call String [Expr]
           | If Expr Expr Expr

+          | For String Expr Expr (Maybe Expr) Expr

   deriving Show
 data BinOpType = Add | Sub | Mul | Cmp Ordering
   deriving Show
 
 instance Read AST where
   deriving Show
 data BinOpType = Add | Sub | Mul | Cmp Ordering
   deriving Show
 
 instance Read AST where

-  readPrec = parseFunction +++ (Eval <$> readPrec)
-    where parseFunction = lift $ do
-            skipSpaces
-            string "def"
-            skipSpaces
+  readPrec = parseFunction +++ parseExtern +++ (Eval <$> readPrec)
+    where parseFunction = do
+            lift $ string "def" >> skipSpaces
+            (name, params) <- parsePrototype
+            lift skipSpaces
+            Function name params <$> readPrec
+          parseExtern = do
+            lift $ string "extern" >> skipSpaces
+            uncurry Extern <$> parsePrototype
+          parsePrototype = lift $ do

             name <- munch1 isAlpha
             params <- between (char '(') (char ')') $
                       sepBy (munch1 isAlpha) skipSpaces
             name <- munch1 isAlpha
             params <- between (char '(') (char ')') $
                       sepBy (munch1 isAlpha) skipSpaces

-            skipSpaces
-            body <- readS_to_P reads
-            return (Function name params body)
+            return (name, params)

 
 instance Read Expr where
   readPrec = choice [ parseParens
 
 instance Read Expr where
   readPrec = choice [ parseParens


@@ -48,6 +53,7 @@ instance Read Expr where
                     , parseVar
                     , parseCall
                     , parseIf
                     , parseVar
                     , parseCall
                     , parseIf

+                    , parseFor

                     , parseBinOp "+" Add
                     , parseBinOp "-" Sub
                     , parseBinOp "*" Mul
                     , parseBinOp "+" Add
                     , parseBinOp "-" Sub
                     , parseBinOp "*" Mul


@@ -66,13 +72,12 @@ instance Read Expr where
                               (skipSpaces >> char ',' >> skipSpaces)
             return (Call func params)
           parseBinOp s typ = step $ do
                               (skipSpaces >> char ',' >> skipSpaces)
             return (Call func params)
           parseBinOp s typ = step $ do

-            a <- prec 11 readPrec
+            a <- prec 11 readPrec -- set recursion limit of 11

             lift $ do
               skipSpaces
               string s
               skipSpaces
             lift $ do
               skipSpaces
               string s
               skipSpaces

-            b <- readPrec
-            return (BinOp typ a b)
+            BinOp typ a <$> readPrec

           parseIf = do
             lift $ do
               string "if"
           parseIf = do
             lift $ do
               string "if"


@@ -89,3 +94,18 @@ instance Read Expr where
               skipSpaces
             elseE <- step readPrec
             return (If cond thenE elseE)
               skipSpaces
             elseE <- step readPrec
             return (If cond thenE elseE)

+          parseFor = do
+            lift $ do
+              string "for"
+              skipSpaces
+            identifier <- lift (munch1 isAlpha)
+            lift $ skipSpaces >> char '=' >> skipSpaces
+            start <- step readPrec
+            lift $ skipSpaces >> char ',' >> skipSpaces
+            cond <- step readPrec
+            step' <- (do
+              lift $ skipSpaces >> char ',' >> skipSpaces
+              Just <$> step readPrec) <++ pure Nothing
+            lift $ skipSpaces >> string "in" >> skipSpaces
+            body <- step readPrec
+            return (For identifier start cond step' body)