projects
/
kaleidoscope-hs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Generate code for if statements
[kaleidoscope-hs.git]
/
AST.hs
diff --git
a/AST.hs
b/AST.hs
index dfa43b7c60c0d0ced86a73268167b1b9584b9d74..ae18a52347ce91c37336a06f891bae690ba691ec 100644
(file)
--- a/
AST.hs
+++ b/
AST.hs
@@
-8,6
+8,7
@@
data Expr = Num Double
| Var String
| BinOp BinOp Expr Expr
| Call String [Expr]
| Var String
| BinOp BinOp Expr Expr
| Call String [Expr]
+ | If Expr Expr Expr
deriving Show
data BinOp = Add | Sub | Mul | Cmp Ordering
deriving Show
data BinOp = Add | Sub | Mul | Cmp Ordering
@@
-17,7
+18,10
@@
instance Read Expr where
readPrec = parens $ choice [ parseNum
, parseVar
, parseCall
readPrec = parens $ choice [ parseNum
, parseVar
, parseCall
+ , parseIf
, parseBinOp "<" 10 (Cmp LT)
, parseBinOp "<" 10 (Cmp LT)
+ , parseBinOp ">" 10 (Cmp GT)
+ , parseBinOp "==" 10 (Cmp EQ)
, parseBinOp "+" 20 Add
, parseBinOp "-" 20 Sub
, parseBinOp "*" 40 Mul
, parseBinOp "+" 20 Add
, parseBinOp "-" 20 Sub
, parseBinOp "*" 40 Mul
@@
-26,10
+30,7
@@
instance Read Expr where
parseVar = Var <$> lift (munch1 isAlpha)
parseBinOp s prc op = prec prc $ do
a <- step readPrec
parseVar = Var <$> lift (munch1 isAlpha)
parseBinOp s prc op = prec prc $ do
a <- step readPrec
- lift $ do
- skipSpaces
- string s
- skipSpaces
+ spaced $ string s
b <- readPrec
return (BinOp op a b)
parseCall = do
b <- readPrec
return (BinOp op a b)
parseCall = do
@@
-38,6
+39,15
@@
instance Read Expr where
sepBy (readS_to_P reads)
(skipSpaces >> char ',' >> skipSpaces)
return (Call func params)
sepBy (readS_to_P reads)
(skipSpaces >> char ',' >> skipSpaces)
return (Call func params)
+ parseIf = do
+ spaced $ string "if"
+ cond <- readPrec
+ spaced $ string "then"
+ thenE <- readPrec
+ spaced $ string "else"
+ elseE <- readPrec
+ return (If cond thenE elseE)
+ spaced f = lift $ skipSpaces >> f >> skipSpaces
data Prototype = Prototype String [String]
deriving Show
data Prototype = Prototype String [String]
deriving Show