Various updates and added additional expression test8.j

Author: ojd2

compiler

@@ -44,7 +44,7 @@ data Par = 	ParId					Id Structs
 --			<struct> [";" <structs>]				(Statements)
 -- Structs type is defined = takes the following expressions "Struct" and "StructAlt"
 data Structs = 	Struct				Struct
-	| StructAlt						Struct Structs
+	| StructSeperator				Struct Structs
 	    deriving Show
 
 
@@ -67,7 +67,7 @@ data Struct = 	StructExp			Exprs
 -- Exprs type is defined = takes the following expressions "Expr"
 -- Alternative options are "ExprAlt"
 data Exprs = Expression 			Expr
-	| ExprAlt						Expr Exprs						
+	| ExprSeperator					Expr Exprs						
 	    deriving Show
 
 
@@ -108,7 +108,7 @@ data Op = OpAdd
 
 
 
-
+-- Abstract syntax tree expressions:
 
 -- program printInt : string "int" and ExprInt of '42' int
 -- test = Program "printInt" ( Par ( ParId "Int" ( Struct ( StructExp ( Expression ( ExprInt 42 ) ) )   ) ) )
@@ -131,8 +131,12 @@ data Op = OpAdd
 -- 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) ) )  ) )  ) ) )
+-- program printStringInts : func String "Hello World!".
+-- test8 = Program "printStringInts" ( Par ( ParId "ExprSeperator" ( Struct ( StructExp ( ExprSeperator (  ( ExprString "Hello World!" )   )  ( Expression ( ExprInt 42 ) )  )  )  ) ) )
+
+
+
+
 
 
 

compiler.hi

@@ -12,7 +12,7 @@
 
 .method public static main([Ljava/lang/String;)V
 
-   ; allocate stack big enough to hold 2 items
+   ; allocate stack big enough to hold 1 items
    .limit stack 2
    .limit locals 2
 

compiler.hs

@@ -19,7 +19,7 @@
    ; push java.lang.System.out (type PrintStream)
    getstatic java/lang/System/out Ljava/io/PrintStream;
    ; push int to be printed
-   ; 0 = f, 1 = t
+   ; 0 = false, 1 = true
    ldc 1
    ; invoke println
    invokevirtual java/io/PrintStream/println(Z)V ; bool print (Z)

compiler.o

@@ -19,7 +19,7 @@
    ; push java.lang.System.out (type PrintStream)
    getstatic java/lang/System/out Ljava/io/PrintStream;
    ; push int to be printed
-   ; 0 = f, 1 = t
+   ; 0 = false, 1 = true
    ldc 0
    ; invoke println
    invokevirtual java/io/PrintStream/println(Z)V ; bool print (Z)

readme.txt renamed to instructions.txt

@@ -22,7 +22,7 @@
 
    ldc 10 ; load int
    ldc 5 ; load int
-   iadd ; add int
+   iadd ; add ints
    istore_0 ; store result in variable
    iload 0 ; load variable, push to top of stack
    ; invoke println

test.j

@@ -12,7 +12,7 @@
 
 .method public static main([Ljava/lang/String;)V
 
-   ; allocate stack big enough to hold 3 items
+   ; allocate stack big enough to hold 2 items
    .limit stack 3 
    .limit locals 2 ; should be fine with 2
 

test3.j

@@ -1,32 +1,48 @@
-.class public test7
+.class public test8
 .super java/lang/Object
 
 ; standard initializer
 ; default constructor
 
 .method public <init>()V
-   aload_0 ; push this
-   invokespecial java/lang/Object/<init>()V ; call super
+   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 3 items
-   .limit stack 3 
-   .limit locals 2 ; should be fine with 2
-  
+   ; allocate stack big enough to hold 2 items
+   .limit stack 3
+   .limit locals 2
+   
+   ; push string to be printed
+   ldc "Hello World!"
+   astore 0 ; astore for strings
+   ldc 42
+   istore 1 ; istore for ints
+
+   ; push java.lang.System.out (type PrintStream)
+   ; getstatic modifies the stack. Be aware.
+   getstatic java/lang/System/out Ljava/io/PrintStream; 
+   
+   aload 0 ; 0 top of stack
+
+   ; invoke println
+   invokevirtual java/io/PrintStream/println(Ljava/lang/String;)V ; string print
+
    ; push java.lang.System.out (type PrintStream)
+   getstatic modifies the stack. Be aware.
    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
+   iload 1 ; 1 bottom of stack but at top after print
+
    ; invoke println
-   invokevirtual java/io/PrintStream/println(I)V ; int print result
+   invokevirtual java/io/PrintStream/println(I)V ; int print
+
+
+
+   
    ; terminate main
    return