SB-31: Translation Issues

Author: PhilipJonasFranz

release/snips.exe

@@ -18,7 +18,7 @@ struct A<K> : GetSet<K> {
 		return self->val;
 	}
 
-	K set<K>(K val) {
+	void set<K>(K val) {
 		self->val = val;
 	}
 }

release/snips.jar

@@ -49,6 +49,8 @@
 import Imm.AST.Statement.AssignWriteback;
 import Imm.AST.Statement.Assignment;
 import Imm.AST.Statement.Assignment.ASSIGN_ARITH;
+import Imm.AST.Typedef.InterfaceTypedef;
+import Imm.AST.Typedef.StructTypedef;
 import Imm.AST.Statement.BreakStatement;
 import Imm.AST.Statement.CaseStatement;
 import Imm.AST.Statement.CompoundStatement;
@@ -61,11 +63,9 @@
 import Imm.AST.Statement.ForStatement;
 import Imm.AST.Statement.FunctionCall;
 import Imm.AST.Statement.IfStatement;
-import Imm.AST.Statement.InterfaceTypedef;
 import Imm.AST.Statement.ReturnStatement;
 import Imm.AST.Statement.SignalStatement;
 import Imm.AST.Statement.Statement;
-import Imm.AST.Statement.StructTypedef;
 import Imm.AST.Statement.SwitchStatement;
 import Imm.AST.Statement.TryStatement;
 import Imm.AST.Statement.WatchStatement;
@@ -351,7 +351,6 @@ public TYPE checkFunction(Function f) throws CTX_EXC {
 	}
 
 	public TYPE checkStructTypedef(StructTypedef e) throws CTX_EXC {
-		
 		/* Make sure at least one field is in the struct */
 		if (e.getFields().isEmpty())
 			throw new CTX_EXC(e.getSource(), Const.STRUCT_TYPEDEF_MUST_CONTAIN_FIELD);
@@ -428,7 +427,9 @@ public TYPE checkStructTypedef(StructTypedef e) throws CTX_EXC {
 
 			for (Function f : inter.getTypedef().functions) {
 
-				Function ftranslated = inter.getTypedef().requestFunction(f.path, inter.proviso);
+				Function ftranslated = f.cloneSignature();
+				
+				ftranslated.translateProviso(inter.getTypedef().proviso, inter.proviso);
 
 				boolean found = false;
 				for (int i = 0; i < e.functions.size(); i++) {

res/Test/Value/Interfaces/test_13.txt

@@ -41,4 +41,8 @@ public void setContext(List<TYPE> context) throws CTX_EXC {
 		this.expression.setContext(context);
 	}
 
+	public Expression clone() {
+		return new AddressOf(this.expression.clone(), this.getSource().clone());
+	}
+
 } 

src/Ctx/ContextChecker.java

@@ -18,4 +18,8 @@ public Add(Expression left, Expression right, Source source) {
 		super(left, right, Operator.ADD, source);
 	}
 
+	public BinaryExpression clone() {
+		return new Add(this.left.clone(), this.right.clone(), this.getSource().clone());
+	}
+	
 } 

src/Imm/AST/Expression/AddressOf.java

@@ -18,4 +18,8 @@ public BitAnd(Expression left, Expression right, Source source) {
 		super(left, right, Operator.LSR, source);
 	}
 
+	public BinaryExpression clone() {
+		return new BitAnd(this.left.clone(), this.right.clone(), this.getSource().clone());
+	}
+	
 } 

src/Imm/AST/Expression/Arith/Add.java

@@ -17,5 +17,9 @@ public class BitNot extends UnaryExpression {
 	public BitNot(Expression operand, Source source) {
 		super(operand, UnaryOperator.NOT, source);
 	}
+	
+	public UnaryExpression clone() {
+		return new BitNot(this.getOperand().clone(), this.getSource().clone());
+	}
 
 } 

src/Imm/AST/Expression/Arith/BitAnd.java

@@ -18,4 +18,8 @@ public BitOr(Expression left, Expression right, Source source) {
 		super(left, right, Operator.LSR, source);
 	}
 
+	public BinaryExpression clone() {
+		return new BitOr(this.left.clone(), this.right.clone(), this.getSource().clone());
+	}
+	
 } 

src/Imm/AST/Expression/Arith/BitNot.java

@@ -17,5 +17,9 @@ public class BitXor extends BinaryExpression {
 	public BitXor(Expression left, Expression right, Source source) {
 		super(left, right, Operator.LSR, source);
 	}
+	
+	public BinaryExpression clone() {
+		return new BitXor(this.left.clone(), this.right.clone(), this.getSource().clone());
+	}
 
 }