Changes

Author: MightyHelper

.idea/workspace.xml

@@ -27,6 +27,7 @@ public final class TinyRustSymbolTable implements SymbolTable {
 	public MethodEntry activeMethod = new MethodEntry(this, null);
 	public ClassEntry activeClass = new ClassEntry(this);
 	public Stack<StatementEntry> statementStack = new Stack<>();
+	public Stack<ExpressionEntry> expressionStack = new Stack<>();
 	public StatementEntry activeStatement = null;
 	public ExpressionEntry activeExpression = null;
 
@@ -153,6 +154,7 @@ public void newWile() {
 		activeStatement = new WhileStatementEntry();
 	}
 
+	@CalledByParser
 	public void whileBody() {
 		WhileStatementEntry active = (WhileStatementEntry) activeStatement;
 		statementStack.push(active);
@@ -162,7 +164,21 @@ public void whileBody() {
 		active.setCondition(activeExpression);
 	}
 
+	@CalledByParser
 	public void end(){
 		activeStatement = statementStack.pop();
 	}
+	/**
+	 * Wrap the current expression in a binary expression
+	 */
+	@CalledByParser
+	public void expWrapBin(List<TinyRustLexerToken> op){
+		// TODO: Assert op size is 1
+		String lex = op.get(0).lexeme();
+		BinaryExpressionEntry nw = new BinaryExpressionEntry();
+		nw.setLeft(activeExpression);
+		nw.setOperator(lex);
+		expressionStack.push(nw);
+		activeExpression = nw;
+	}
 }

src/main/java/ko/carbonel/compiler/intermediate/tinyRust/TinyRustSymbolTable.java

@@ -4,4 +4,22 @@ public class BinaryExpressionEntry extends ExpressionEntry {
 	ExpressionEntry left;
 	ExpressionEntry right;
 	String operator;
+	public ExpressionEntry getLeft() {
+		return left;
+	}
+	public void setLeft(ExpressionEntry left) {
+		this.left = left;
+	}
+	public ExpressionEntry getRight() {
+		return right;
+	}
+	public void setRight(ExpressionEntry right) {
+		this.right = right;
+	}
+	public String getOperator() {
+		return operator;
+	}
+	public void setOperator(String operator) {
+		this.operator = operator;
+	}
 }

src/main/java/ko/carbonel/compiler/intermediate/tinyRust/ast/BinaryExpressionEntry.java

@@ -17,18 +17,18 @@ ExpAdRF ::= ExpAdR | "λ"
 ExpAdR ::= OpAd ExpMul ExpAdRF
 ExpAd ::= ExpMul ExpAdRF
 ExpAndF ::= ExpAndR | "λ"
-ExpAndR ::= "&&" ExpEq ExpAndF
+ExpAndR ::= "&&" {st.expWrapBin(List.of("&&"))} ExpEq ExpAndF
 ExpAnd ::= ExpEq ExpAndF
 ExpEqRF ::= ExpEqR | "λ"
-ExpEqR ::= OpEq ExpRel ExpEqRF
+ExpEqR ::= OpEq {st.expWrapBin(v_0)} ExpRel ExpEqRF
 ExpEq ::= ExpRel ExpEqRF
 ExpMulF ::= ExpMulR | "λ"
 ExpMulR ::= OpMul ExpUn ExpMulF
 ExpMul ::= ExpUn ExpMulF
 ExpOrF ::= ExpOrR | "λ"
-ExpOrR ::= "||" ExpAnd ExpOrF
+ExpOrR ::= "||" {st.expWrapBin(List.of("||"))} ExpAnd ExpOrF
 ExpOr ::= ExpAnd ExpOrF
-ExpRelF ::= OpRel ExpAd | "λ"
+ExpRelF ::= OpRel {st.expWrapBin(v_0)} ExpAd | "λ"
 ExpRel ::= ExpAd ExpRelF
 ExpUn ::= OpUn ExpUn | Operand
 ExprListF ::= "λ" | "," ExprList
@@ -44,11 +44,11 @@ MethodF ::= Stmt_star "}" | "}"
 Method ::= "STATIC" "FN" "ATTR_ID" { st.newMethod(true, v_2) } Params "-" ">" ReturnType {st.activeMethod.setReturn(v_7)} "{" programFFFF { st.addMethod() } | "FN" "ATTR_ID" { st.newMethod(false, v_1) } Params "-" ">" ReturnType { st.activeMethod.setReturn(v_6)} "{" programFFFF { st.addMethod() }
 NewCallFF ::= "CLASS_ID" Args StaticMethodCallF | PrimType "[" ExpOr "]"
 NewCall ::= "NEW" NewCallFF
-OpAd ::= "+" | "-"
-OpEq ::= "==" | "!="
-OpMul ::= "*" | "/" | "%"
-OpRel ::= "<" | ">" | "<=" | ">="
-OpUn ::= "+" | "-" | "!"
+OpAd ::= "+" {!} | "-" {!}
+OpEq ::= "==" {!} | "!=" {!}
+OpMul ::= "*" {!} | "/" {!} | "%" {!}
+OpRel ::= "<" {!} | ">" {!} | "<=" {!} | ">=" {!}
+OpUn ::= "+" {!} | "-" {!} | "!" {!}
 Operand ::= Primary StaticMethodCallF | Literal
 ParamListF ::= "," ParamList | "λ"
 ParamList ::= Type ":" "ATTR_ID" { st.activeMethod.addParameter(v_0, v_2) } ParamListF