Start working on test system

Author: MightyHelper

.idea/workspace.xml

@@ -17,5 +17,7 @@ public enum ArgumentName {
 	SYNTAX_DEBUG,
 	OP,
 	ALL_OPTIONS,
-	IDE_OFFSET_FIX, TARGET
+	IDE_OFFSET_FIX,
+	TARGET,
+	CHECK_EXPRESSIONS
 }

src/main/java/ko/carbonel/compiler/config/ArgumentName.java

@@ -47,6 +47,7 @@ public class Config {
 		addArgument(new Flag(ArgumentName.SYNTAX_DEBUG, "Output extra syntax debug info (very verbose)", false));
 		addArgument(new Flag(ArgumentName.ALL_OPTIONS, "Output all options during syntax error", false));
 		addArgument(new Flag(ArgumentName.IDE_OFFSET_FIX, "Add 1 to error line and column for IDE direct link", false));
+		addArgument(new Flag(ArgumentName.CHECK_EXPRESSIONS, "Check that the expressions are correct", true));
 		addArgument(new FileArgument(ArgumentName.INPUT_RS_FILE, "Input tinyRust+ file", List.of(".rs"), true, true, ""));
 		addArgument(new FileArgument(ArgumentName.INPUT_GRAMMAR_FILE, "Grammar file", List.of(".syn", ".bnf"), false, true, ""));
 		addArgument(new FileArgument(ArgumentName.OUTPUT_ASM_FILE, "Output MIPS file", List.of(".asm"), false, false, ""));

src/main/java/ko/carbonel/compiler/config/Config.java

@@ -19,9 +19,6 @@
 import static ko.carbonel.json.SerializeClass.AST;
 import static ko.carbonel.json.SerializeClass.TS;
 
-// TODO: Static access for methods. ! Done
-// TODO: Separate literals ! Done
-
 public final class TinyRustSymbolTable implements SymbolTable {
 	public static final String OBJECT = "Object";
 	static final String STR = "Str";
@@ -34,10 +31,10 @@ public final class TinyRustSymbolTable implements SymbolTable {
 	public final List<ClassEntry> classEntries;
 	@SerializeClass({TS, AST})
 	public final MethodEntry main;
-	public MethodEntry activeMethod = new MethodEntry(this, null);
-	public ClassEntry activeClass = new ClassEntry(this);
 	private final Stack<StatementEntry> statementStack = new Stack<>();
 	private final Stack<ExpressionEntry> expressionStack = new Stack<>();
+	public MethodEntry activeMethod = new MethodEntry(this, null);
+	public ClassEntry activeClass = new ClassEntry(this);
 
 	public TinyRustSymbolTable() {
 		this.classEntries = new ArrayList<>();
@@ -115,20 +112,6 @@ public void consolidate() {
 		activeClass = null;
 	}
 
-	private void populatePredefined() {
-		classEntries.add(new ClassEntry(this, new TinyRustLexerToken(TinyRustTokenType.INT, I_32), false, true));
-		classEntries.add(new ClassEntry(this, new TinyRustLexerToken(TinyRustTokenType.BOOL, BOOL), false, true));
-		classEntries.add(new ClassEntry(this, new TinyRustLexerToken(TinyRustTokenType.CHR, CHAR), false, true));
-		classEntries.add(new ClassEntry(this, new TinyRustLexerToken(TinyRustTokenType.STR, STR), false, true));
-		classEntries.add(new ClassEntry(this, new TinyRustLexerToken(TinyRustTokenType.CLASS_ID, OBJECT), true, false));
-		populateStdlib();
-	}
-
-	private void populateStdlib() {
-		// TODO: Add stdlib classes
-		classEntries.add(new ClassEntry(this, new TinyRustLexerToken(TinyRustTokenType.CLASS_ID, IO), false, false));
-	}
-
 	@CalledByParser
 	public void newIf() {
 		IfStatementEntry newIf = new IfStatementEntry();
@@ -140,7 +123,7 @@ public void newIf() {
 	public void ifBlock() {
 		IfStatementEntry active = (IfStatementEntry) statementStack.peek();
 		ExpressionEntry condition = expressionStack.pop();
-		active.setCondition(condition);
+		active.setIfCondition(condition);
 		Logger.output("If condition set");
 	}
 
@@ -163,53 +146,47 @@ public void ifEnd() {
 
 	@CalledByParser
 	public void newReturn() {
-		ReturnStatementEntry newReturn = new ReturnStatementEntry();
-		statementStack.push(newReturn);
+		newStatement(new ReturnStatementEntry());
+	}
+
+	private void newStatement(StatementEntry statement) {
+		statementStack.push(statement);
 	}
 
 	@CalledByParser
 	public void newExpr() {
-		ExpressionStatementEntry newExpr = new ExpressionStatementEntry();
-		statementStack.push(newExpr);
+		newStatement(new ExpressionStatementEntry());
 	}
 
 	@CalledByParser
 	public void newWhile() {
-		WhileStatementEntry newWhile = new WhileStatementEntry();
-		statementStack.push(newWhile);
+		newStatement(new WhileStatementEntry());
 	}
 
 	@CalledByParser
 	public void newAssign() {
-		AssignStatementEntry newAssign = new AssignStatementEntry();
-		statementStack.push(newAssign);
+		newStatement(new AssignStatementEntry());
 	}
 
 	public void assignLHS() {
 		AssignStatementEntry active = (AssignStatementEntry) statementStack.peek();
-		active.setLhs(expressionStack.pop());
+		active.setAssignLHS(expressionStack.pop());
 	}
 
 	public void assignRHS() {
 		AssignStatementEntry active = (AssignStatementEntry) statementStack.peek();
-		active.setRhs(expressionStack.pop());
+		active.setAssignRHS(expressionStack.pop());
 	}
 
 	@CalledByParser
 	public void newEmpty() {
-		EmptyStatementEntry newEmpty = new EmptyStatementEntry();
-		statementStack.push(newEmpty);
+		newStatement(new EmptyStatementEntry());
 	}
 
 	@CalledByParser
 	public void whileBody() {
 		WhileStatementEntry active = (WhileStatementEntry) statementStack.peek();
-		active.setCondition(expressionStack.pop());
-	}
-
-	@CalledByParser
-	public void end() {
-		Logger.output("TODO"); // FIXME
+		active.setWhileCondition(expressionStack.pop());
 	}
 
 	/**
@@ -233,11 +210,6 @@ public void expBinComplete() {
 		Logger.output("Binary expression: " + nw);
 	}
 
-	@CalledByParser
-	public void expLit(TinyRustLexerToken lit) {
-		expLit(List.of(lit));
-	}
-
 	@CalledByParser
 	public void expLit(List<TinyRustLexerToken> lit) {
 		if (lit.size() != 1) throw new RuntimeException("Literal size is not 1");
@@ -307,14 +279,6 @@ public void expArrayAccess() {
 		expressionStack.push(arr);
 	}
 
-	@CalledByParser
-	public void expChain() {
-		ChainedExpressionEntry chain = new ChainedExpressionEntry();
-		chain.setChain(expressionStack.pop());
-		chain.setBase(expressionStack.pop());
-		expressionStack.push(chain);
-	}
-
 	@CalledByParser
 	public void newBlock() {
 		BlockStatementEntry block = new BlockStatementEntry();
@@ -330,31 +294,6 @@ public void endBlock() {
 		});
 	}
 
-	private <T extends StatementEntry> void popStatementUntil(Class<T> clazz, BiConsumer<T, List<StatementEntry>> callback) {
-		popUntil(clazz, callback, statementStack, it -> false);
-	}
-
-	/**
-	 * Pop until the top of the stack is an instance of clazz, then call callback with the top of the stack cast to clazz and the popped statements
-	 *
-	 * @param <T>       The class to pop until
-	 * @param <S>       The type of the stack
-	 * @param clazz     The class to pop until
-	 * @param callback  The callback to call
-	 * @param stack     The stack to pop from
-	 * @param predicate A predicate to test the popped statements - if true, the popped statements are added to the list anyway
-	 */
-	private <T extends S, S> void popUntil(Class<T> clazz, BiConsumer<T, List<S>> callback, Stack<S> stack, Predicate<T> predicate) {
-		List<S> statementList = new ArrayList<>();
-		while (!(clazz.isInstance(stack.peek())) || predicate.test(clazz.cast(stack.peek())))
-			statementList.add(0, stack.pop());
-		callback.accept(clazz.cast(stack.peek()), statementList);
-	}
-
-	private <T extends ExpressionEntry> void popExpressionUntil(Class<T> clazz, BiConsumer<T, List<ExpressionEntry>> callback, Predicate<T> predicate) {
-		popUntil(clazz, callback, expressionStack, predicate);
-	}
-
 	@CalledByParser
 	public void endExpr() {
 		ExpressionStatementEntry exp = (ExpressionStatementEntry) statementStack.peek();
@@ -389,7 +328,7 @@ public void endWhile() {
 	@CalledByParser
 	public void endReturn(){
 		ReturnStatementEntry ret = new ReturnStatementEntry();
-		ret.setExpression(expressionStack.pop());
+		ret.setReturnExpression(expressionStack.pop());
 		statementStack.push(ret);
 		Logger.output("Return: " + ret);
 	}
@@ -450,4 +389,43 @@ public void expNewArray(){
 		exp.setType(type.fieldName());
 		expressionStack.push(exp);
 	}
+
+	private void populatePredefined() {
+		classEntries.add(new ClassEntry(this, new TinyRustLexerToken(TinyRustTokenType.INT, I_32), false, true));
+		classEntries.add(new ClassEntry(this, new TinyRustLexerToken(TinyRustTokenType.BOOL, BOOL), false, true));
+		classEntries.add(new ClassEntry(this, new TinyRustLexerToken(TinyRustTokenType.CHR, CHAR), false, true));
+		classEntries.add(new ClassEntry(this, new TinyRustLexerToken(TinyRustTokenType.STR, STR), false, true));
+		classEntries.add(new ClassEntry(this, new TinyRustLexerToken(TinyRustTokenType.CLASS_ID, OBJECT), true, false));
+		populateStdlib();
+	}
+
+	private void populateStdlib() {
+		// TODO: Add stdlib classes
+		classEntries.add(new ClassEntry(this, new TinyRustLexerToken(TinyRustTokenType.CLASS_ID, IO), false, false));
+	}
+
+	private <T extends StatementEntry> void popStatementUntil(Class<T> clazz, BiConsumer<T, List<StatementEntry>> callback) {
+		popUntil(clazz, callback, statementStack, it -> false);
+	}
+
+	/**
+	 * Pop until the top of the stack is an instance of clazz, then call callback with the top of the stack cast to clazz and the popped statements
+	 *
+	 * @param <T>       The class to pop until
+	 * @param <S>       The type of the stack
+	 * @param clazz     The class to pop until
+	 * @param callback  The callback to call
+	 * @param stack     The stack to pop from
+	 * @param predicate A predicate to test the popped statements - if true, the popped statements are added to the list anyway
+	 */
+	private <T extends S, S> void popUntil(Class<T> clazz, BiConsumer<T, List<S>> callback, Stack<S> stack, Predicate<T> predicate) {
+		List<S> statementList = new ArrayList<>();
+		while (!(clazz.isInstance(stack.peek())) || predicate.test(clazz.cast(stack.peek())))
+			statementList.add(0, stack.pop());
+		callback.accept(clazz.cast(stack.peek()), statementList);
+	}
+
+	private <T extends ExpressionEntry> void popExpressionUntil(Class<T> clazz, BiConsumer<T, List<ExpressionEntry>> callback, Predicate<T> predicate) {
+		popUntil(clazz, callback, expressionStack, predicate);
+	}
 }