Merged changes from feature/scl to master.

[simantics/platform.git] / bundles / org.simantics.scl.compiler / src / org / simantics / scl / compiler / elaboration / expressions / EVariable.java

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EVariable.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EVariable.java
index ca87d72c4e8d878ac3cb30c445758578b43a9295..666bc2aca1783b209f2ee3caf47157deb96e9bb4 100755 (executable)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EVariable.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EVariable.java
@@ -149,7 +149,7 @@ public class EVariable extends Expression {
             return this;\r
         }\r
         else\r
-            return applyPUnit(context);\r
+            return applyPUnit(context.getCompilationContext());\r
     }\r
     \r
     @Override\r
@@ -202,5 +202,13 @@ public class EVariable extends Expression {
     public Expression accept(ExpressionTransformer transformer) {\r
         return transformer.transform(this);\r
     }\r
+    \r
+    @Override\r
+    public boolean equalsExpression(Expression expression) {\r
+        if(expression.getClass() != getClass())\r
+            return false;\r
+        EVariable other = (EVariable)expression;\r
+        return variable == other.variable;\r
+    }\r
 \r
 }\r