simple-program.ob compiles. simple varibake declaration should compile

now

haw/ci/Application.java

@@ -24,7 +24,8 @@ public static void main(String[] args) throws IOException {
 			System.out.println(node.toString());
 
 			System.out.println("Code:");
-			node.compile(new SymbolTable());
+			SymbolTable symbolTable = new SymbolTable();
+			node.compile(symbolTable);
 		} catch (ParserAcceptError e) {
 			System.out.println(String.format("Failure (cur: %s, nex: %s)", parser.getCurrent(),parser.getNext()));
 			e.printStackTrace();

haw/ci/lib/Parser.java

@@ -55,7 +55,6 @@
 import haw.ci.lib.nodes.FormalParameterSectionNode;
 import haw.ci.lib.nodes.IdentListNode;
 import haw.ci.lib.nodes.IdentNode;
-import haw.ci.lib.nodes.IdentifierTypeNode;
 import haw.ci.lib.nodes.IfStatementNode;
 import haw.ci.lib.nodes.IntegerNode;
 import haw.ci.lib.nodes.ModuleNode;
@@ -146,7 +145,7 @@ private AbstractNode Type() throws ParserAcceptError {
 		AbstractNode type = null;
 		switch (current.getToken()) {
 		case IDENTIFER:
-			type = new IdentifierTypeNode(current.getValue());
+			type = new IdentNode(current.getValue());
 			next();
 			break;
 		case ARRAY:

haw/ci/lib/SymbolTable.java

@@ -40,14 +40,14 @@ public int getConstVal(String ident){
 
 
 
-	public void declare(String ident, Descriptor descr) {
+	public void declare(String ident, Descriptor descriptor) {
 		if(!(addressMap.containsKey(ident))){
-			descriptorMap.put(ident, descr);
+			descriptorMap.put(ident, descriptor);
 			addressMap.put(ident, currentAddress);
-			if(descr == null){
+			if(descriptor == null){
 				System.out.println("---- compile Error-----\n Variable = " + ident);
 			}
-			currentAddress += descr.size();
+			currentAddress += descriptor.size();
 		}else{
 			System.out.println("Fehler, zweimal die gleiche Variable deklariert");
 		}

haw/ci/lib/nodes/IdentListNode.java

@@ -1,5 +1,8 @@
 package haw.ci.lib.nodes;
 
+import haw.ci.lib.SymbolTable;
+import haw.ci.lib.descriptor.Descriptor;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -46,5 +49,13 @@ public String toString(int indentation) {
 		}
 		return  output;
 	}
+
+	public Descriptor compile(SymbolTable symbolTable, Descriptor descriptor) {
+		for (IdentNode node : nodes) {
+			symbolTable.declare(node.getIdentifierName(), descriptor);
+		}
+
+		return null;
+	}
 
 }

haw/ci/lib/nodes/TypeDeclarationNode.java

@@ -45,10 +45,10 @@ public boolean equals(Object obj) {
 	public String toString(int indentation) {
 		String result = toString(indentation, this.getClass().getName() + "\n");
 		if(ident != null) {
-		    result += ident.toString() + "\n";
+		    result += ident.toString(indentation) + "\n";
 		}
 		if(type != null) {
-		    result += type.toString() + "\n";
+		    result += type.toString(indentation) + "\n";
 		}
 
 	    return result;

haw/ci/lib/nodes/VarListNode.java

@@ -1,5 +1,8 @@
 package haw.ci.lib.nodes;
 
+import haw.ci.lib.SymbolTable;
+import haw.ci.lib.descriptor.Descriptor;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -46,6 +49,14 @@ public String toString(int indentation) {
 		}
 		return  output;
 	}
+
+	public Descriptor compile(SymbolTable symbolTable) {
+		for (VarNode node : nodes) {
+			node.compile(symbolTable);
+		}
+
+		return null;
+	}
 
 
 

haw/ci/lib/nodes/VarNode.java

@@ -51,10 +51,10 @@ public boolean equals(Object obj) {
 	public String toString(int indentation) {
 		String result = toString(indentation, this.getClass().getName() + "\n");
 		if(identList != null) {
-		    result += identList.toString() + "\n";
+		    result += identList.toString(indentation) + "\n";
 		}
 		if(type != null) {
-		    result += type.toString() + "\n";
+		    result += type.toString(indentation) + "\n";
 		}
 
 	    return result;

simple-program.ob

@@ -1,4 +1,5 @@
 module foo;
+var i, j : integer;
 begin
 i  :=  1;
 j  :=  2;