Add while and !, fix error in consecutive declarations

1 files changed, 16 insertions, 3 deletions

diff --git a/Sil/Compile.icl b/Sil/Compile.icl
index b4854ba..ca375b1 100644
--- a/Sil/Compile.icl
+++ b/Sil/Compile.icl
@@ -184,7 +184,7 @@ instance gen Statement
 where
 	gen st=:(Declaration n app) = gets addresses >>= \addrs -> case 'M'.get n addrs of
 		Just i -> comment (toString st) *> gen app *>
-		          tell ['ABC'.Update_a 0 $ i+1, 'ABC'.Pop_a 1]
+		          tell ['ABC'.Update_a 0 $ i+1, 'ABC'.Pop_a 1] *> shrinkStack 1
 		_      -> liftT $ Error $ UndefinedName n
 	gen (Application e)   = comment "Application" *> gen e *> tell ['ABC'.Pop_a 1]
 	gen (Return (Just e)) = comment "Return" *> gen e *> cleanup *> tell ['ABC'.Rtn]
@@ -208,6 +208,15 @@ where
 		genelse :: 'ABC'.Label (Maybe CodeBlock) -> Gen ()
 		genelse end Nothing   = tell ['ABC'.Label end]
 		genelse end (Just cb) = gen cb *> tell ['ABC'.Label end]
+	gen (While cond do) =
+		fresh "while" >>= \loop -> fresh "whileend" >>= \end ->
+		tell [ 'ABC'.Label loop ] *>
+		gen cond *>
+		toBStack 'ABC'.BT_Bool 1 *>
+		tell [ 'ABC'.JmpFalse end ] *>
+		gen do *>
+		tell [ 'ABC'.Jmp loop
+		     , 'ABC'.Label end ]
 
 instance gen Expression
 where
@@ -237,12 +246,16 @@ where
 instance gen Op1
 where
 	gen op =
-		toBStack 'ABC'.BT_Int 1 *>
+		toBStack type 1 *>
 		tell [instr] *>
-		BtoAStack 'ABC'.BT_Int
+		BtoAStack type
 	where
 		instr = case op of
 			Neg -> 'ABC'.NegI
+			Not -> 'ABC'.NotB
+		type = case op of
+			Neg -> 'ABC'.BT_Int
+			Not -> 'ABC'.BT_Bool
 
 instance gen Op2
 where