Changes to ConcreteSyntax

Author: marenhewitt

src/main/java/com/scanner/project/ConcreteSyntax.java

@@ -50,8 +50,8 @@ public Program program() {
 		this.match("main");
 		this.match("{");
 		Program p = new Program();
-		p.decpart = this.declarations();
-		p.body = this.statements();
+		p.decpart = declarations();
+		p.body = statements();
 		this.match("}");
 		return p;
 	}
@@ -79,11 +79,11 @@ private Type type() {
 		// Type --> integer | bool
 		Type t = null;
 		if (token.getValue().equals("integer"))
-			t = new Type(token.getValue());
+			t = new Type(Type.INTEGER);
 		else if (token.getValue().equals("bool"))
-			t = new Type(token.getValue());
+			t = new Type(Type.BOOLEAN);
 		else
-			throw new RuntimeException(SyntaxError("integer | bool"));
+			throw new RuntimeException(SyntaxError("integer | boolean"));
 		token = input.nextToken(); // pass over the type
 		return t;
 	}
@@ -131,7 +131,7 @@ else if (token.getValue().equals("while")) { // WhileStatement
 		} else if (token.getType().equals("Identifier")) { // Assignment
 			// TODO TO BE COMPLETED
 			s = assignment();
-			match(";");
+			//match(";");
 		} else
 			throw new RuntimeException(SyntaxError("Statement"));
 		return s;
@@ -151,13 +151,13 @@ private Assignment assignment() {
 		Assignment a = new Assignment();
 		if (token.getType().equals("Identifier")) {
 			// TODO TO BE COMPLETED
-			Variable target = new Variable();
-			target.id = token.getValue();
-			a.target = target;
+			Variable v = new Variable();
+			v.id = token.getValue();
+			a.target = v;
 			token = input.nextToken();
-
 			match(":=");
 			a.source = expression();
+			match(";");
 		} else
 			throw new RuntimeException(SyntaxError("Identifier"));
 		return a;
@@ -278,7 +278,7 @@ private Expression factor() {
 		} else if (token.getType().equals("Literal")) {
 			Value v = null;
 			if (isInteger(token.getValue()))
-				v = new Value((new Integer(token.getValue())).intValue());
+				v = new Value((Integer.parseInt(token.getValue())));
 			else if (token.getValue().equals("True"))
 				v = new Value(true);
 			else if (token.getValue().equals("False"))
@@ -307,7 +307,7 @@ private Conditional ifStatement() {
 		c.thenbranch = statement();
 
 		if (token.getValue().equals("else")){
-			match("else");
+			token = input.nextToken();
 			c.elsebranch = statement();
 		} else {
 			c.elsebranch = null;