Small Update

Author: ojd2

compiler

@@ -86,7 +86,7 @@ data Expr = ExprInt 				Int
 	| ExprBool						Bool
 	| ExprAssignment				Id Exprs
 	| ExprRaise						Id Exprs
-	| ExprCacth						Exprs Id Id Exprs
+	| ExprCatch						Exprs Id Id Exprs
 	| ExprOp						Exprs Op Exprs
 	| ExprGroup						Exprs
 	    deriving Show
@@ -126,7 +126,13 @@ data Op = OpAdd
 --test5 = Program "opAddInts" ( Par ( ParId "OpAdd" ( Struct ( StructExp ( Expression ( ExprOp (Expression (ExprInt 10) ) (OpAdd) (Expression (ExprInt 5) ) )  ) )  ) ) )
 
 -- program opMinusInts : func OpMinus ExprInt 100, OpAdd ExprInt 35
-test6 = Program "opMinusInts" ( Par ( ParId "OpMinus" ( Struct ( StructExp ( Expression ( ExprOp (Expression (ExprInt 100) ) (OpMinus) (Expression (ExprInt 35) ) )  ) )  ) ) )
+-- test6 = Program "opMinusInts" ( Par ( ParId "OpMinus" ( Struct ( StructExp ( Expression ( ExprOp (Expression (ExprInt 100) ) (OpMinus) (Expression (ExprInt 35) ) )  ) )  ) ) )
+
+-- program opDivideInts : func OpMinus ExprInt 100, OpAdd ExprInt 35
+-- test7 = Program "opDivideInts" ( Par ( ParId "OpDivide" ( Struct ( StructExp ( Expression ( ExprOp (Expression (ExprInt 100) ) (OpDivide) (Expression (ExprInt 35) ) )  ) )  ) ) )
+
+-- program opDivideInts : func OpMinus ExprInt 100, OpAdd ExprInt 35
+-- test8 = Program "strComp" ( Par ( ParId "StructComp" ( Struct ( StructExp ( Expression ( ExprOp (Expression (ExprInt 20) ) (OpLess) (Expression (ExprInt 80) ) )  ) )  ) ) )
 
 
 
@@ -137,5 +143,5 @@ test6 = Program "opMinusInts" ( Par ( ParId "OpMinus" ( Struct ( StructExp ( Exp
 
 
 -- Print out test program above using AST declarations
-main = print test6
+main = print test8
 

compiler.hs

@@ -0,0 +1,33 @@
+.class public test6
+.super java/lang/Object
+
+; standard initializer
+; default constructor
+
+.method public <init>()V
+   aload_0 ; push this
+   invokespecial java/lang/Object/<init>()V ; call super
+   return
+.end method
+
+.method public static main([Ljava/lang/String;)V
+
+   ; allocate stack big enough to hold 3 items
+   .limit stack 3 
+   .limit locals 2 ; should be fine with 2
+  
+   ; push java.lang.System.out (type PrintStream)
+   getstatic java/lang/System/out Ljava/io/PrintStream;
+   ; push ints to be printed   
+   
+   ldc 100 ; load int
+   ldc 35 ; load int
+   isub ; subtract int
+   istore_0 ; store result in variable
+   iload 0 ; load variable, push to top of stack
+   ; invoke println
+   invokevirtual java/io/PrintStream/println(I)V ; int print result
+   ; terminate main
+   return
+
+.end method

compiler.o

@@ -0,0 +1,33 @@
+.class public test7
+.super java/lang/Object
+
+; standard initializer
+; default constructor
+
+.method public <init>()V
+   aload_0 ; push this
+   invokespecial java/lang/Object/<init>()V ; call super
+   return
+.end method
+
+.method public static main([Ljava/lang/String;)V
+
+   ; allocate stack big enough to hold 3 items
+   .limit stack 3 
+   .limit locals 2 ; should be fine with 2
+  
+   ; push java.lang.System.out (type PrintStream)
+   getstatic java/lang/System/out Ljava/io/PrintStream;
+   ; push ints to be printed   
+   
+   ldc 100 ; load int
+   ldc 35 ; load int
+   idiv ; divide int
+   istore_0 ; store result in variable
+   iload 0 ; load variable, push to top of stack
+   ; invoke println
+   invokevirtual java/io/PrintStream/println(I)V ; int print result
+   ; terminate main
+   return
+
+.end method

test6.class

@@ -0,0 +1,33 @@
+.class public test7
+.super java/lang/Object
+
+; standard initializer
+; default constructor
+
+.method public <init>()V
+   aload_0 ; push this
+   invokespecial java/lang/Object/<init>()V ; call super
+   return
+.end method
+
+.method public static main([Ljava/lang/String;)V
+
+   ; allocate stack big enough to hold 3 items
+   .limit stack 3 
+   .limit locals 2 ; should be fine with 2
+  
+   ; push java.lang.System.out (type PrintStream)
+   getstatic java/lang/System/out Ljava/io/PrintStream;
+   ; push ints to be printed   
+   
+   ldc 20 ; load int
+   ldc 80 ; load int
+   if_icmple ; if less than int
+   istore_0 ; store result in variable
+   iload 0 ; load variable, push to top of stack
+   ; invoke println
+   invokevirtual java/io/PrintStream/println(I)V ; int print result
+   ; terminate main
+   return
+
+.end method