Added more additional testing

Author: ojd2

compiler

@@ -125,16 +125,20 @@ data Op = OpAdd
 -- program opAddInts : func OpAdd ExprInt 10, OpAdd ExprInt 10
 --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
+-- program opMinusInts : func OpMinus ExprInt 100, OpMinus 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
+-- program opDivideInts : func OpMinus ExprInt 100, OpDivide ExprInt 35
 -- test7 = Program "opDivideInts" ( Par ( ParId "OpDivide" ( Struct ( StructExp ( Expression ( ExprOp (Expression (ExprInt 100) ) (OpDivide) (Expression (ExprInt 35) ) )  ) )  ) ) )
 
--- program printStringInts : func String "Hello World!".
+-- program printStringInts : func String "Hello World!" func Int 42. return
 -- test8 = Program "printStringInts" ( Par ( ParId "ExprSeperator" ( Struct ( StructExp ( ExprSeperator (  ( ExprString "Hello World!" )   )  ( Expression ( ExprInt 42 ) )  )  )  ) ) )
 
+-- program printStringBool : func String "Hello World!" func Int 42. return
+-- test9 = Program "printStringBool" ( Par ( ParId "ExprSeperator" ( Struct ( StructExp ( ExprSeperator (  ( ExprString "Hello World!" )   )  ( Expression ( ExprBool True ) )  )  )  ) ) )
 
+-- program printStringBool : func String "Hello World!" func Int 42. return
+test10 = Program "opMultiplyInts" ( Par ( ParId "OpMultiply" ( Struct ( StructExp ( Expression ( ExprOp (Expression (ExprInt 235) ) (OpMultiply) (Expression (ExprInt 19) ) )  ) )  ) ) )
 
 
 
@@ -147,5 +151,5 @@ data Op = OpAdd
 
 
 -- Print out test program above using AST declarations
-main = print test8
+main = print test10
 

compiler.hs

@@ -0,0 +1,35 @@
+.class public test10
+.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 2 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 235 ; load int
+   ldc 19 ; load int
+   imul ; multiply ints
+
+   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,39 @@
+.class public test9
+.super java/lang/Object
+
+; standard initializer
+; default constructor
+
+.method public <init>()V
+   aload_0
+   invokespecial java/lang/Object/<init>()V
+   return
+.end method
+
+.method public static main([Ljava/lang/String;)V
+
+   ; allocate stack big enough to hold 2 items
+   .limit stack 3
+   .limit locals 2   
+
+   ; push java.lang.System.out (type PrintStream)
+   ; getstatic modifies the stack. Be aware.
+   getstatic java/lang/System/out Ljava/io/PrintStream; 
+   ; push string to be printed
+   ldc "Hello World!"
+
+   ; invoke println
+   invokevirtual java/io/PrintStream/println(Ljava/lang/String;)V ; string print
+
+   ; push java.lang.System.out (type PrintStream)
+   getstatic java/lang/System/out Ljava/io/PrintStream;
+   ; push int to be printed
+   ; 0 = false, 1 = true
+   ldc 1
+   ; invoke println
+   invokevirtual java/io/PrintStream/println(Z)V ; bool print (Z)
+
+   ; terminate main
+   return
+
+.end method