end of practical 2

.classpath

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
+	<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+	<classpathentry kind="output" path="bin/default"/>
+</classpath>

.gitignore

@@ -60,3 +60,9 @@ local.properties
 # Typically, this file would be tracked if it contains build/dependency configurations:
 #.project
 /.gradle/
+
+# tam files
+*.tam
+
+# Build folder
+/build/

.project

@@ -5,6 +5,11 @@
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 		<buildCommand>
 			<name>org.eclipse.buildship.core.gradleprojectbuilder</name>
 			<arguments>
@@ -12,6 +17,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
 </projectDescription>

README.md

@@ -0,0 +1,2 @@
+# A5 Triangle Compiler
+

Triangle.AbstractMachine.Disassembler/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'java'
 apply plugin: 'application'
 
-sourceCompatibility = 17
+sourceCompatibility = 11
 
 dependencies {
 	implementation project(':Triangle.AbstractMachine')

Triangle.AbstractMachine.Interpreter/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'java'
 apply plugin: 'application'
 
-sourceCompatibility = 17
+sourceCompatibility = 11
 
 dependencies {
 	implementation project(':Triangle.AbstractMachine')

Triangle.AbstractMachine/build.gradle

@@ -1,4 +1,4 @@
 apply plugin: 'java-library'
 apply plugin: 'eclipse'
 
-sourceCompatibility = 17
+sourceCompatibility = 11

Triangle.Compiler/.project

@@ -20,4 +20,11 @@
 		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
 	</natures>
+	<linkedResources>
+		<link>
+			<name>programs</name>
+			<type>2</type>
+			<location>/home/simon/Documents/Uni/CS/CSCU9A5/Triangle-Tools/programs</location>
+		</link>
+	</linkedResources>
 </projectDescription>

Triangle.Compiler/build.gradle

@@ -1,12 +1,21 @@
 apply plugin: 'java'
 apply plugin: 'application'
 
-sourceCompatibility = 17
+sourceCompatibility = 11
+
+repositories {
+    mavenCentral()
+}
+
 
 dependencies {
 	implementation project(':Triangle.AbstractMachine')
+	testImplementation group: 'junit', name: 'junit', version: '4.13.2'
 }
 
 application {
 	mainClass = 'Triangle.Compiler'
 }
+
+// allow access to programs for unit tests
+sourceSets.test.resources.srcDir file("$rootDir/programs")

Triangle.Compiler/src/main/java/triangle/Compiler.java

@@ -34,6 +34,8 @@ public class Compiler {
 	/** The filename for the object program, normally obj.tam. */
 	static String objectName = "obj.tam";
 	
+	static boolean showTree = false;
+
 	private static Scanner scanner;
 	private static Parser parser;
 	private static Checker checker;
@@ -71,7 +73,7 @@ public class Compiler {
 		}
 
 		scanner = new Scanner(source);
-		reporter = new ErrorReporter();
+		reporter = new ErrorReporter(false);
 		parser = new Parser(scanner, reporter);
 		checker = new Checker(reporter);
 		emitter = new Emitter(reporter);
@@ -80,7 +82,7 @@ public class Compiler {
 
 		// scanner.enableDebugging();
 		theAST = parser.parseProgram(); // 1st pass
-		if (reporter.numErrors == 0) {
+		if (reporter.getNumErrors() == 0) {
 			// if (showingAST) {
 			// drawer.draw(theAST);
 			// }
@@ -89,13 +91,13 @@ public class Compiler {
 			if (showingAST) {
 				drawer.draw(theAST);
 			}
-			if (reporter.numErrors == 0) {
+			if (reporter.getNumErrors() == 0) {
 				System.out.println("Code Generation ...");
 				encoder.encodeRun(theAST, showingTable); // 3rd pass
 			}
 		}
 
-		boolean successful = (reporter.numErrors == 0);
+		boolean successful = (reporter.getNumErrors() == 0);
 		if (successful) {
 			emitter.saveObjectProgram(objectName);
 			System.out.println("Compilation was successful.");
@@ -114,16 +116,29 @@ public class Compiler {
 	public static void main(String[] args) {
 
 		if (args.length < 1) {
-			System.out.println("Usage: tc filename [tree]");
+			System.out.println("Usage: tc filename [-o=outputfilename] [tree]");
 			System.exit(1);
 		}
 		
-		String sourceName = args[0];
+		parseArgs(args);
-		boolean tree = (args.length > 1 && args[1].equalsIgnoreCase("tree"));
-		var compiledOK = compileProgram(sourceName, objectName, tree, false);
 
-		if (!tree) {
+		String sourceName = args[0];
+		
+		var compiledOK = compileProgram(sourceName, objectName, showTree, false);
+
+		if (!showTree) {
 			System.exit(compiledOK ? 0 : 1);
 		}
 	}
+	
+	private static void parseArgs(String[] args) {
+		for (String s : args) {
+			var sl = s.toLowerCase();
+			if (sl.equals("tree")) {
+				showTree = true;
+			} else if (sl.startsWith("-o=")) {
+				objectName = s.substring(3);
+			}
+		}
+	}
 }

Triangle.Compiler/src/main/java/triangle/ErrorReporter.java

@@ -18,25 +18,44 @@ import triangle.syntacticAnalyzer.SourcePosition;
 
 public class ErrorReporter {
 
-	int numErrors;
+	private int numErrors;
 	
-	ErrorReporter() {
+	private boolean throwExceptions;
+
+	/**
+	 * @param throwExceptions if true, throw exceptions (good for unit tests) otherwise write to stdout
+	 */
+	public ErrorReporter(boolean throwExceptions) {
 		numErrors = 0;
+		this.throwExceptions = throwExceptions;
 	}
 
 	public void reportError(String message, String tokenName, SourcePosition pos) {
-		System.out.print("ERROR: ");
+
+		numErrors++;
+		
+		String s = ("ERROR: ");
 
 		for (int p = 0; p < message.length(); p++)
 			if (message.charAt(p) == '%')
-				System.out.print(tokenName);
+				s += tokenName;
 			else
-				System.out.print(message.charAt(p));
+				s += message.charAt(p);
-		System.out.println(" " + pos.start + ".." + pos.finish);
+		s += (" " + pos.start + ".." + pos.finish);
-		numErrors++;
+		
+		if (throwExceptions) {
+			throw new RuntimeException(s);
+		} else {
+			System.out.println(s);
+		}
+		
 	}
 
 	public void reportRestriction(String message) {
 		System.out.println("RESTRICTION: " + message);
 	}
+	
+	public int getNumErrors() {
+		return numErrors;
+	}
 }

Triangle.Compiler/src/main/java/triangle/abstractSyntaxTrees/commands/RepeatCommand.java

@@ -0,0 +1,21 @@
+package triangle.abstractSyntaxTrees.commands;
+
+import triangle.abstractSyntaxTrees.expressions.Expression;
+import triangle.abstractSyntaxTrees.visitors.CommandVisitor;
+import triangle.syntacticAnalyzer.SourcePosition;
+
+public class RepeatCommand extends Command {
+
+	public RepeatCommand(Expression eAST, Command cAST, SourcePosition position) {
+		super(position);
+		E = eAST;
+		C = cAST;
+	}
+
+	public <TArg, TResult> TResult visit(CommandVisitor<TArg, TResult> v, TArg arg) {
+		return v.visitRepeatCommand(this, arg);
+	}
+
+	public final Expression E;
+	public final Command C;
+}

Triangle.Compiler/src/main/java/triangle/abstractSyntaxTrees/formals/ConstFormalParameter.java

@@ -39,8 +39,8 @@ public class ConstFormalParameter extends FormalParameter implements ConstantDec
 
 	@Override
 	public boolean equals(Object fpAST) {
-		if (fpAST instanceof ConstFormalParameter cfpAST) {
+		if (fpAST instanceof ConstFormalParameter) {
-			return T.equals(cfpAST.T);
+			return T.equals(((ConstFormalParameter)fpAST).T);
 		} else {
 			return false;
 		}

Triangle.Compiler/src/main/java/triangle/abstractSyntaxTrees/formals/VarFormalParameter.java

@@ -39,8 +39,8 @@ public class VarFormalParameter extends FormalParameter implements VariableDecla
 
 	@Override
 	public boolean equals(Object fpAST) {
-		if (fpAST instanceof VarFormalParameter vfpAST) {
+		if (fpAST instanceof VarFormalParameter) {
-			return T.equals(vfpAST.T);
+			return T.equals(((VarFormalParameter)fpAST).T);
 		} else {
 			return false;
 		}

Triangle.Compiler/src/main/java/triangle/abstractSyntaxTrees/visitors/CommandVisitor.java

@@ -5,11 +5,11 @@ import triangle.abstractSyntaxTrees.commands.CallCommand;
 import triangle.abstractSyntaxTrees.commands.EmptyCommand;
 import triangle.abstractSyntaxTrees.commands.IfCommand;
 import triangle.abstractSyntaxTrees.commands.LetCommand;
+import triangle.abstractSyntaxTrees.commands.RepeatCommand;
 import triangle.abstractSyntaxTrees.commands.SequentialCommand;
 import triangle.abstractSyntaxTrees.commands.WhileCommand;
 
 public interface CommandVisitor<TArg, TResult> {
-
 	TResult visitAssignCommand(AssignCommand ast, TArg arg);
 
 	TResult visitCallCommand(CallCommand ast, TArg arg);
@@ -24,4 +24,6 @@ public interface CommandVisitor<TArg, TResult> {
 
 	TResult visitWhileCommand(WhileCommand ast, TArg arg);
 	
+	TResult visitRepeatCommand(RepeatCommand ast, TArg arg);
+
 }

Triangle.Compiler/src/main/java/triangle/codeGenerator/Encoder.java

@@ -38,6 +38,7 @@ import triangle.abstractSyntaxTrees.commands.CallCommand;
 import triangle.abstractSyntaxTrees.commands.EmptyCommand;
 import triangle.abstractSyntaxTrees.commands.IfCommand;
 import triangle.abstractSyntaxTrees.commands.LetCommand;
+import triangle.abstractSyntaxTrees.commands.RepeatCommand;
 import triangle.abstractSyntaxTrees.commands.SequentialCommand;
 import triangle.abstractSyntaxTrees.commands.WhileCommand;
 import triangle.abstractSyntaxTrees.declarations.BinaryOperatorDeclaration;
@@ -181,6 +182,11 @@ public final class Encoder implements ActualParameterVisitor<Frame, Integer>,
 		return null;
 	}
 	
+	@Override
+	public Void visitRepeatCommand(RepeatCommand ast, Frame frame) {
+		return null;
+	}
+
 	// Expressions
 	@Override
 	public Integer visitArrayExpression(ArrayExpression ast, Frame frame) {

Triangle.Compiler/src/main/java/triangle/contextualAnalyzer/Checker.java

@@ -34,6 +34,7 @@ import triangle.abstractSyntaxTrees.commands.CallCommand;
 import triangle.abstractSyntaxTrees.commands.EmptyCommand;
 import triangle.abstractSyntaxTrees.commands.IfCommand;
 import triangle.abstractSyntaxTrees.commands.LetCommand;
+import triangle.abstractSyntaxTrees.commands.RepeatCommand;
 import triangle.abstractSyntaxTrees.commands.SequentialCommand;
 import triangle.abstractSyntaxTrees.commands.WhileCommand;
 import triangle.abstractSyntaxTrees.declarations.BinaryOperatorDeclaration;
@@ -132,7 +133,8 @@ public final class Checker implements ActualParameterVisitor<FormalParameter, Vo
 	public Void visitCallCommand(CallCommand ast, Void arg) {
 		var binding = ast.I.visit(this);
 
-		if (binding instanceof ProcedureDeclaration procedure) {
+		if (binding instanceof ProcedureDeclaration) {
+			ProcedureDeclaration procedure = (ProcedureDeclaration)binding;
 			ast.APS.visit(this, procedure.getFormals());
 		} else {
 			reportUndeclaredOrError(binding, ast.I, "\"%\" is not a procedure identifier");
@@ -184,6 +186,11 @@ public final class Checker implements ActualParameterVisitor<FormalParameter, Vo
 		return null;
 	}
 	
+	@Override
+	public Void visitRepeatCommand(RepeatCommand ast, Void arg) {
+		return null;
+	}
+
 	// Expressions
 
 	// Returns the TypeDenoter denoting the type of the expression. Does
@@ -203,7 +210,8 @@ public final class Checker implements ActualParameterVisitor<FormalParameter, Vo
 		var e2Type = ast.E2.visit(this);
 		var binding = ast.O.visit(this);
 
-		if (binding instanceof BinaryOperatorDeclaration bbinding) {
+		if (binding instanceof BinaryOperatorDeclaration) {
+			BinaryOperatorDeclaration bbinding = (BinaryOperatorDeclaration)binding;
 			if (bbinding.ARG1 == StdEnvironment.anyType) {
 				// this operator must be "=" or "\="
 				checkAndReportError(e1Type.equals(e2Type), "incompatible argument types for \"%\"", ast.O, ast);
@@ -222,7 +230,8 @@ public final class Checker implements ActualParameterVisitor<FormalParameter, Vo
 	public TypeDenoter visitCallExpression(CallExpression ast, Void arg) {
 		var binding = ast.I.visit(this);
 
-		if (binding instanceof FunctionDeclaration function) {
+		if (binding instanceof FunctionDeclaration) {
+			FunctionDeclaration function = (FunctionDeclaration)binding;
 			ast.APS.visit(this, function.getFormals());
 			return ast.type = function.getType();
 		}
@@ -277,7 +286,8 @@ public final class Checker implements ActualParameterVisitor<FormalParameter, Vo
 		var eType = ast.E.visit(this);
 		var binding = ast.O.visit(this);
 
-		if (binding instanceof UnaryOperatorDeclaration ubinding) {
+		if (binding instanceof UnaryOperatorDeclaration) {
+			UnaryOperatorDeclaration ubinding = (UnaryOperatorDeclaration)binding;
 			checkAndReportError(eType.equals(ubinding.ARG), "wrong argument type for \"%\"", ast.O);
 			return ast.type = ubinding.RES;
 		}
@@ -472,8 +482,9 @@ public final class Checker implements ActualParameterVisitor<FormalParameter, Vo
 	@Override
 	public Void visitConstActualParameter(ConstActualParameter ast, FormalParameter arg) {
 		var eType = ast.E.visit(this);
-		if (arg instanceof ConstFormalParameter param) {
+		if (arg instanceof ConstFormalParameter) {
-			checkAndReportError(eType.equals(param.T), "wrong type for const actual parameter", ast.E);
+			ConstFormalParameter param = (ConstFormalParameter)arg;
+			checkAndReportError(eType.equals(((ConstFormalParameter)arg).T), "wrong type for const actual parameter", ast.E);
 		} else {
 			reportError("const actual parameter not expected here", ast);
 		}
@@ -483,10 +494,12 @@ public final class Checker implements ActualParameterVisitor<FormalParameter, Vo
 	@Override
 	public Void visitFuncActualParameter(FuncActualParameter ast, FormalParameter arg) {
 		var binding = ast.I.visit(this);
-		if (binding instanceof FunctionDeclaration function) {
+		if (binding instanceof FunctionDeclaration) {
+			FunctionDeclaration function = (FunctionDeclaration)binding;
 			var formals = function.getFormals();
 			var functionType = function.getType();
-			if (arg instanceof FuncFormalParameter param) {
+			if (arg instanceof FuncFormalParameter) {
+				FuncFormalParameter param = (FuncFormalParameter)arg;
 				if (!formals.equals(param.getFormals())) {
 					reportError("wrong signature for function \"%\"", ast.I);
 				} else if (!functionType.equals(param.T)) {
@@ -504,9 +517,11 @@ public final class Checker implements ActualParameterVisitor<FormalParameter, Vo
 	@Override
 	public Void visitProcActualParameter(ProcActualParameter ast, FormalParameter arg) {
 		var binding = ast.I.visit(this);
-		if (binding instanceof ProcedureDeclaration procedure) {
+		if (binding instanceof ProcedureDeclaration) {
+			ProcedureDeclaration procedure = (ProcedureDeclaration)binding;
 			var formals = procedure.getFormals();
-			if (arg instanceof ProcFormalParameter param) {
+			if (arg instanceof ProcFormalParameter) {
+				ProcFormalParameter param = (ProcFormalParameter)arg;
 				checkAndReportError(formals.equals(param.getFormals()), "wrong signature for procedure \"%\"", ast.I);
 			} else {
 				reportError("proc actual parameter not expected here", ast);
@@ -522,7 +537,8 @@ public final class Checker implements ActualParameterVisitor<FormalParameter, Vo
 		var vType = ast.V.visit(this);
 		if (!ast.V.variable) {
 			reportError("actual parameter is not a variable", ast.V);
-		} else if (arg instanceof VarFormalParameter parameter) {
+		} else if (arg instanceof VarFormalParameter) {
+			VarFormalParameter parameter = (VarFormalParameter)arg;
 			checkAndReportError(vType.equals(parameter.T), "wrong type for var actual parameter", ast.V);
 		} else {
 			reportError("var actual parameter not expected here", ast.V);
@@ -538,7 +554,8 @@ public final class Checker implements ActualParameterVisitor<FormalParameter, Vo
 
 	@Override
 	public Void visitMultipleActualParameterSequence(MultipleActualParameterSequence ast, FormalParameterSequence arg) {
-		if (arg instanceof MultipleFormalParameterSequence formals) {
+		if (arg instanceof MultipleFormalParameterSequence) {
+			MultipleFormalParameterSequence formals = (MultipleFormalParameterSequence)arg;
 			ast.AP.visit(this, formals.FP);
 			ast.APS.visit(this, formals.FPS);
 		} else {
@@ -549,7 +566,8 @@ public final class Checker implements ActualParameterVisitor<FormalParameter, Vo
 
 	@Override
 	public Void visitSingleActualParameterSequence(SingleActualParameterSequence ast, FormalParameterSequence arg) {
-		if (arg instanceof SingleFormalParameterSequence formal) {
+		if (arg instanceof SingleFormalParameterSequence) {
+			SingleFormalParameterSequence formal = (SingleFormalParameterSequence)arg;
 			ast.AP.visit(this, formal.FP);
 		} else {
 			reportError("incorrect number of actual parameters", ast);
@@ -592,7 +610,8 @@ public final class Checker implements ActualParameterVisitor<FormalParameter, Vo
 	@Override
 	public TypeDenoter visitSimpleTypeDenoter(SimpleTypeDenoter ast, Void arg) {
 		var binding = ast.I.visit(this);
-		if (binding instanceof TypeDeclaration decl) {
+		if (binding instanceof TypeDeclaration) {
+			TypeDeclaration decl = (TypeDeclaration)binding;
 			return decl.T;
 		}
 
@@ -679,7 +698,8 @@ public final class Checker implements ActualParameterVisitor<FormalParameter, Vo
 		ast.type = null;
 		var vType = ast.V.visit(this);
 		ast.variable = ast.V.variable;
-		if (vType instanceof RecordTypeDenoter record) {
+		if (vType instanceof RecordTypeDenoter) {
+			RecordTypeDenoter record = (RecordTypeDenoter)vType;
 			ast.type = checkFieldIdentifier(record.FT, ast.I);
 			checkAndReportError(ast.type != StdEnvironment.errorType, "no field \"%\" in this record type",
 					ast.I);
@@ -695,10 +715,12 @@ public final class Checker implements ActualParameterVisitor<FormalParameter, Vo
 		ast.type = StdEnvironment.errorType;
 
 		var binding = ast.I.visit(this);
-		if (binding instanceof ConstantDeclaration constant) {
+		if (binding instanceof ConstantDeclaration) {
+			ConstantDeclaration constant = (ConstantDeclaration)binding;
 			ast.variable = false;
 			return ast.type = constant.getType();
-		} else if (binding instanceof VariableDeclaration variable) {
+		} else if (binding instanceof VariableDeclaration) {
+			VariableDeclaration variable = (VariableDeclaration)binding;
 			ast.variable = true;
 			return ast.type = variable.getType();
 		}
@@ -714,7 +736,8 @@ public final class Checker implements ActualParameterVisitor<FormalParameter, Vo
 
 		var eType = ast.E.visit(this);
 		if (vType != StdEnvironment.errorType) {
-			if (vType instanceof ArrayTypeDenoter arrayType) {
+			if (vType instanceof ArrayTypeDenoter) {
+				ArrayTypeDenoter arrayType = (ArrayTypeDenoter)vType;
 				checkAndReportError(eType.equals(StdEnvironment.integerType), "Integer expression expected here",
 						ast.E);
 				ast.type = arrayType.T;
@@ -799,14 +822,16 @@ public final class Checker implements ActualParameterVisitor<FormalParameter, Vo
 	}
 
 	private static TypeDenoter checkFieldIdentifier(FieldTypeDenoter ast, Identifier I) {
-		if (ast instanceof MultipleFieldTypeDenoter ft) {
+		if (ast instanceof MultipleFieldTypeDenoter) {
+			MultipleFieldTypeDenoter ft = (MultipleFieldTypeDenoter)ast;
 			if (ft.I.spelling.compareTo(I.spelling) == 0) {
 				I.decl = ast;
 				return ft.T;
 			} else {
 				return checkFieldIdentifier(ft.FT, I);
 			}
-		} else if (ast instanceof SingleFieldTypeDenoter ft) {
+		} else if (ast instanceof SingleFieldTypeDenoter) {
+			SingleFieldTypeDenoter ft = (SingleFieldTypeDenoter)ast;
 			if (ft.I.spelling.compareTo(I.spelling) == 0) {
 				I.decl = ast;
 				return ft.T;

Triangle.Compiler/src/main/java/triangle/syntacticAnalyzer/Parser.java

@@ -37,6 +37,7 @@ import triangle.abstractSyntaxTrees.commands.Command;
 import triangle.abstractSyntaxTrees.commands.EmptyCommand;
 import triangle.abstractSyntaxTrees.commands.IfCommand;
 import triangle.abstractSyntaxTrees.commands.LetCommand;
+import triangle.abstractSyntaxTrees.commands.RepeatCommand;
 import triangle.abstractSyntaxTrees.commands.SequentialCommand;
 import triangle.abstractSyntaxTrees.commands.WhileCommand;
 import triangle.abstractSyntaxTrees.declarations.ConstDeclaration;
@@ -320,7 +321,7 @@ public class Parser {
 		}
 			break;
 
-		case Token.WHILE: {
+		case Token.WHILE: { //while expr. do command
 			acceptIt();
 			Expression eAST = parseExpression();
 			accept(Token.DO);
@@ -330,6 +331,16 @@ public class Parser {
 		}
 			break;
 
+		case Token.REPEAT: { //repeat command until expr.
+			acceptIt(); 
+			Command cAST = parseSingleCommand();
+			accept(Token.UNTIL); 		//check that there is a "until"
+			Expression eAST = parseExpression();
+			finish(commandPos); 
+			commandAST = new RepeatCommand(eAST, cAST, commandPos); 
+		}
+			break;
+			
 		case Token.SEMICOLON:
 		case Token.END:
 		case Token.ELSE:

Triangle.Compiler/src/main/java/triangle/syntacticAnalyzer/Scanner.java

@@ -35,7 +35,7 @@ public final class Scanner {
 
 	private boolean isOperator(char c) {
 		return (c == '+' || c == '-' || c == '*' || c == '/' || c == '=' || c == '<' || c == '>' || c == '\\'
-				|| c == '&' || c == '@' || c == '%' || c == '^' || c == '?');
+				|| c == '&' || c == '@' || c == '%' || c == '^' || c == '?' || c == '|');
 	}
 
 	///////////////////////////////////////////////////////////////////////////////
@@ -64,7 +64,7 @@ public final class Scanner {
 	private void scanSeparator() {
 		switch (currentChar) {
 		
-		// comment
+		// ! comment
 		case '!': {
 			takeIt();
 			while ((currentChar != SourceFile.EOL) && (currentChar != SourceFile.EOT))
@@ -74,6 +74,28 @@ public final class Scanner {
 		}
 			break;
 			
+		// new type of comment, the # comment, same as before when it comes to code
+		case '#':{
+			takeIt();
+			while((currentChar != SourceFile.EOL) && (currentChar != SourceFile.EOT))
+				takeIt();
+			if(currentChar == SourceFile.EOL)
+				takeIt();
+		}
+			break;
+
+		// new type of comment, the multi-line $ comment
+		case '$':{
+			takeIt();
+			//check if it is not the comment char or EOT, skipping new lines (no EOL)
+			while((currentChar != '$') && (currentChar != SourceFile.EOT))
+				takeIt();
+			//if we reach another $, takeIt and move on, we've reached the end of the multi-line comment
+			if(currentChar == '$')
+				takeIt();
+		}
+			break;
+		
 		// whitespace
 		case ' ':
 		case '\n':
@@ -178,6 +200,13 @@ public final class Scanner {
 				takeIt();
 			return Token.OPERATOR;
 			
+		// TODO: Bar operator, week 3
+		case '|':
+			takeIt();
+			while(isOperator(currentChar))
+				takeIt();
+		return Token.OPERATOR;
+
 		case '\'':
 			takeIt();
 			takeIt(); // the quoted character
@@ -252,7 +281,7 @@ public final class Scanner {
 		currentlyScanningToken = false;
 		// skip any whitespace or comments
 		while (currentChar == '!' || currentChar == ' ' || currentChar == '\n' || currentChar == '\r'
-				|| currentChar == '\t')
+				|| currentChar == '\t' || currentChar == '#' || currentChar == '$')
 			scanSeparator();
 
 		currentlyScanningToken = true;

Triangle.Compiler/src/main/java/triangle/syntacticAnalyzer/SourceFile.java

@@ -14,26 +14,36 @@
 
 package triangle.syntacticAnalyzer;
 
+import java.net.URL;
+
 public class SourceFile {
 
 	public static final char EOL = '\n';
 	public static final char EOT = '\u0000';
 
 	java.io.File sourceFile;
-	java.io.FileInputStream source;
+	java.io.InputStream source;
 	int currentLine;
 
 	public static SourceFile ofPath(String pathname) {
 		try {
-			return new SourceFile(pathname);
+			SourceFile sf = new SourceFile();
+			sf.sourceFile = new java.io.File(pathname);
+			sf.source = new java.io.FileInputStream(sf.sourceFile);
+			return sf;
 		} catch (java.io.IOException s) {
 			return null;
 		}
 	}
 	
-	private SourceFile(String pathname) throws java.io.FileNotFoundException {
+	public static SourceFile fromResource(String handle) {
-		sourceFile = new java.io.File(pathname);
+		SourceFile sf = new SourceFile();
-		source = new java.io.FileInputStream(sourceFile);
+		//sf.sourceFile = new java.io.File(pathname);
+		sf.source = sf.getClass().getResourceAsStream(handle);
+		return sf;
+	}
+
+	private SourceFile() {
 		currentLine = 1;
 	}
 

Triangle.Compiler/src/main/java/triangle/syntacticAnalyzer/Token.java

@@ -64,20 +64,20 @@ final class Token extends Object {
 
 			// reserved words - must be in alphabetical order...
 			ARRAY = 4, BEGIN = 5, CONST = 6, DO = 7, ELSE = 8, END = 9, FUNC = 10, IF = 11, IN = 12, LET = 13, OF = 14,
-			PROC = 15, RECORD = 16, THEN = 17, TYPE = 18, VAR = 19, WHILE = 20,
+			PROC = 15, RECORD = 16, REPEAT = 17, THEN = 18, TYPE = 19, UNTIL = 20, VAR = 21, WHILE = 22,
 
 			// punctuation...
-			DOT = 21, COLON = 22, SEMICOLON = 23, COMMA = 24, BECOMES = 25, IS = 26,
+			DOT = 23, COLON = 24, SEMICOLON = 25, COMMA = 26, BECOMES = 27, IS = 28,
 
 			// brackets...
-			LPAREN = 27, RPAREN = 28, LBRACKET = 29, RBRACKET = 30, LCURLY = 31, RCURLY = 32,
+			LPAREN = 29, RPAREN = 30, LBRACKET = 31, RBRACKET = 32, LCURLY = 33, RCURLY = 34,
 
 			// special tokens...
-			EOT = 33, ERROR = 34;
+			EOT = 35, ERROR = 36;
 
 	private static String[] tokenTable = new String[] { "<int>", "<char>", "<identifier>", "<operator>", "array",
-			"begin", "const", "do", "else", "end", "func", "if", "in", "let", "of", "proc", "record", "then", "type",
+			"begin", "const", "do", "else", "end", "func", "if", "in", "let", "of", "proc", "record", "repeat", "then", "type",
-			"var", "while", ".", ":", ";", ",", ":=", "~", "(", ")", "[", "]", "{", "}", "", "<error>" };
+			"until", "var", "while", ".", ":", ";", ",", ":=", "~", "(", ")", "[", "]", "{", "}", "", "<error>" };
 
 	private final static int firstReservedWord = Token.ARRAY, lastReservedWord = Token.WHILE;
 

Triangle.Compiler/src/main/java/triangle/treeDrawer/Drawer.java

@@ -42,6 +42,13 @@ public class Drawer {
 
 		FontMetrics fontMetrics = frame.getFontMetrics(font);
 
+		// another class of visitor is used for drawing the tree: LayoutVisitor
+		// LayoutVisitor is passed to the AST which, in turn, calls visitProgram
+		// and then each AST node is visited. This ultimately constructs a 
+		// DrawingTree, which is structurally the same as the AST but is decorated
+		// with coordinates (and has only DrawingTree objects as nodes)
+		// Each DrawingTree object knows how to paint itself, so it's passed to a
+		// DrawerPanel and DrawerFrame for display 
 		LayoutVisitor layout = new LayoutVisitor(fontMetrics);
 		theDrawing = (DrawingTree) theAST.visit(layout, null);
 		theDrawing.position(new Point(2048, 10));

Triangle.Compiler/src/main/java/triangle/treeDrawer/LayoutVisitor.java

@@ -33,6 +33,7 @@ import triangle.abstractSyntaxTrees.commands.CallCommand;
 import triangle.abstractSyntaxTrees.commands.EmptyCommand;
 import triangle.abstractSyntaxTrees.commands.IfCommand;
 import triangle.abstractSyntaxTrees.commands.LetCommand;
+import triangle.abstractSyntaxTrees.commands.RepeatCommand;
 import triangle.abstractSyntaxTrees.commands.SequentialCommand;
 import triangle.abstractSyntaxTrees.commands.WhileCommand;
 import triangle.abstractSyntaxTrees.declarations.BinaryOperatorDeclaration;
@@ -159,6 +160,11 @@ public class LayoutVisitor implements ActualParameterVisitor<Void, DrawingTree>,
 		return layoutBinary("WhileCom.", d1, d2);
 	}
 	
+	@Override
+	public DrawingTree visitRepeatCommand(RepeatCommand ast, Void obj) {
+		return null;
+	}
+
 	// Expressions
 	@Override
 	public DrawingTree visitArrayExpression(ArrayExpression ast, Void obj) {

Triangle.Compiler/src/main/java/triangle/treeDrawer/Polyline.java

@@ -14,6 +14,9 @@
 
 package triangle.treeDrawer;
 
+/**
+ * used to keep track of the position for components in the tree to be drawn
+ */
 class Polyline {
 	int dx, dy;
 	Polyline link;

Triangle.Compiler/src/test/java/triangle/syntacticAnalyser/TestScanner.java

@@ -0,0 +1,90 @@
+package triangle.syntacticAnalyser;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotEquals;
+import static org.junit.Assert.assertThrows;
+
+import org.junit.Test;
+import org.junit.function.ThrowingRunnable;
+
+import triangle.ErrorReporter;
+import triangle.syntacticAnalyzer.Parser;
+import triangle.syntacticAnalyzer.Scanner;
+import triangle.syntacticAnalyzer.SourceFile;
+
+public class TestScanner {
+
+	@Test
+	public void testHi() {
+		compileExpectSuccess("/hi.tri");
+	}
+	
+
+	@Test
+	public void testHiNewComment() {
+		compileExpectSuccess("/hi-newcomment.tri");
+	}
+	
+
+	@Test
+	public void testHiNewComment2() {
+		compileExpectSuccess("/hi-newcomment2.tri");
+	}
+	
+
+	@Test
+	public void testBarDemo() {
+		compileExpectSuccess("/bardemo.tri"); //TODO: Change this to failure
+	}
+	
+
+	@Test
+	public void testRepeatUntil() {
+		compileExpectSuccess("/repeatuntil.tri");
+	}
+	
+	@Test
+	public void testAdd() {
+		//compileExpectFailure("/addd.tri"); //fail here!
+		compileExpectFailure("/add.tri");
+	}
+	
+	
+	
+	private void compileExpectSuccess(String filename) {
+		// build.gradle has a line sourceSets.test.resources.srcDir file("$rootDir/programs")
+		// which adds the programs directory to the list of places Java can easily find files
+		// getResource() below searches for a file, which is in /programs 
+		//SourceFile source = SourceFile.ofPath(this.getClass().getResource(filename).getFile().toString());
+		SourceFile source = SourceFile.fromResource(filename);
+		
+		Scanner scanner = new Scanner(source);
+		ErrorReporter reporter = new ErrorReporter(true);
+		Parser parser = new Parser(scanner, reporter);
+		
+		parser.parseProgram();
+		
+		// we should get to here with no exceptions
+		
+		assertEquals("Problem compiling " + filename, 0, reporter.getNumErrors());
+	}
+	
+	private void compileExpectFailure(String filename) {
+		//SourceFile source = SourceFile.ofPath(this.getClass().getResource(filename).getFile().toString());
+		SourceFile source = SourceFile.fromResource(filename);
+		Scanner scanner = new Scanner(source);
+		ErrorReporter reporter = new ErrorReporter(true);
+		Parser parser = new Parser(scanner, reporter);
+
+		// we expect an exception here as the program has invalid syntax
+		assertThrows(RuntimeException.class, new ThrowingRunnable() {
+			public void run(){
+				parser.parseProgram();
+			}
+		});
+		
+		// currently this program will fail
+		assertNotEquals("Problem compiling " + filename, 0, reporter.getNumErrors());
+	}
+
+}

build.gradle

@@ -0,0 +1,11 @@
+apply plugin: 'java'
+
+sourceCompatibility = 11
+
+subprojects.each { subproject ->
+  evaluationDependsOn(subproject.path)
+}
+
+jar {
+  from subprojects.sourceSets.main.output
+}

programs/add.tri

@@ -0,0 +1,46 @@
+! Program that will: read two ints, print their sum and their product. If they are the same, print "Same"
+
+! Global Consts, Funcs.
+let 
+    type String ~ array 6 of Char; ! String type implemented, not used yet
+
+    var num1 : Integer;
+    var num2 : Integer;
+
+
+    func sum(x : Integer, y : Integer) : Integer ~
+        x + y;  ! Return x + y
+
+    func product(x : Integer, y : Integer) : Integer ~
+        x * y;  ! Return x * y
+
+    func isSame(x : Integer, y : Integer) : Boolean ~
+        if x = y then true else false
+
+! Main Loop
+in
+    begin
+    num1 := 0;
+    num2 := 0; ! Init. values to 0
+
+    getint(var num1);
+    getint(var num2); ! Get user input
+
+
+    ! Sum
+    putint(num1); put('+'); put(' '); putint(num2); put(' '); put('='); put(' '); 
+    putint(sum(num1, num2)); puteol();
+
+    puteol();
+
+    ! Product
+    putint(num1); put(' '); put('*'); put(' '); putint(num2); put(' '); put('='); put(' '); 
+    putint(product(num1, num2)); puteol();
+
+
+    if isSame(num1, num2) = true then 
+        put('S'); put('a'); put('m'); put('e'); puteol();
+    else 
+        puteol();
+
+    end

programs/bardemo.tri

@@ -0,0 +1,15 @@
+! this won't work until after some work in the practicals
+let
+    var a : Integer;
+    var b : Integer
+
+in
+    begin
+        a := 1;
+        b := 2;
+        
+        putint(a);
+        putint(b);
+        putint(|a);
+        putint(|b)
+    end

programs/errorsfix.tri

@@ -0,0 +1,30 @@
+! Program with a variety of contextual errors.
+
+let
+  type String ~ array 4 of Char;
+  type Name ~ array 3 of String;
+  type Rec ~ record x: Integer, x: Integer end;
+
+  var me: Name;
+  var silly : maxint;
+  var silly: Rec;
+
+  proc putstr (s: String) ~
+    let var i: Integer
+    in
+      begin
+      s[4] := ' ';
+      i := 0;
+      while i do
+        begin i := i+true;
+              put (s[\i])
+        end
+      end
+    
+in
+  begin
+  me[true] := ['T','i','n','y'];
+  me[2][2] := 0;
+  put (me[1]); put (4); put ();
+  putstr (initials (me)); puteol ()
+  end

programs/hi-newcomment.tri

@@ -0,0 +1,7 @@
+! this won't work until after some work in the practicals
+
+# new comment
+
+begin
+ put('H'); put('i'); put('!')
+end

programs/hi-newcomment2.tri

@@ -0,0 +1,14 @@
+! this won't work until after some work in the practicals
+
+# new comment
+
+$
+another new comment
+another new comment
+another new comment
+another new comment
+$
+
+begin
+ put('H'); put('i'); put('!')
+end

programs/repeatuntil.tri

@@ -0,0 +1,14 @@
+! this won't work until after some lab work
+
+let
+  var a : Integer
+in
+begin
+  a := 0;
+  repeat
+  begin
+    put('a');
+    a := a + 1;
+  end
+  until a < 5
+end

programs/while.tri

@@ -0,0 +1,11 @@
+let
+  var a : Integer
+in
+begin
+  a := 0;
+  while a < 5 do
+  begin
+    put('a');
+    a := a + 1;
+  end
+end

tam

@@ -0,0 +1,29 @@
+#!/bin/bash
+
+RED='\033[0;31m'   # Red
+GRN='\033[0;32m' # Green
+NC='\033[0m'       # No Color
+
+file=""
+
+if [ -z "$1" ]
+    then
+        printf "${RED}Usage: $0 file${NC}"
+        exit 1 # Exit with code 1, failure
+    else
+        file=$1
+fi
+
+printf "${GRN}[INFO] Compiling file: $1.tri to $1.tam ...${NC}\n"
+
+# Compile to tam
+if java -cp build/libs/Triangle-Tools.jar triangle.Compiler programs/$1.tri -o=$1.tam &> /dev/null #quiet
+    then 
+        printf "${GRN}[INFO] Running file: $1.tam ...${NC}\n"
+        java -cp build/libs/Triangle-Tools.jar triangle.abstractMachine.Interpreter $1.tam 
+    else
+        printf "${RED}[ERROR] Could not complie $1.tri ...${NC}"
+        err=$(java -cp build/libs/Triangle-Tools.jar triangle.Compiler programs/$1.tri -o=$1.tam)
+        printf "${RED}\n$err\n${NC}"
+        exit 1
+fi