Merged changes from feature/scl to master.

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

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EConstant.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EConstant.java
index 45fb72d6340e1e95bc1cd41f5bfd179b76c14472..068c6c8741629ef58d5f0b3a508ec3c6439aa5c9 100755 (executable)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EConstant.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EConstant.java
@@ -1,9 +1,5 @@
 package org.simantics.scl.compiler.elaboration.expressions;\r
 \r
-import gnu.trove.map.hash.TObjectIntHashMap;\r
-import gnu.trove.set.hash.THashSet;\r
-import gnu.trove.set.hash.TIntHashSet;\r
-\r
 import java.util.ArrayList;\r
 \r
 import org.simantics.scl.compiler.common.names.Name;\r
@@ -35,6 +31,10 @@ import org.simantics.scl.compiler.types.exceptions.MatchException;
 import org.simantics.scl.compiler.types.util.MultiFunction;\r
 import org.simantics.scl.compiler.types.util.TypeUnparsingContext;\r
 \r
+import gnu.trove.map.hash.TObjectIntHashMap;\r
+import gnu.trove.set.hash.THashSet;\r
+import gnu.trove.set.hash.TIntHashSet;\r
+\r
 public class EConstant extends Expression {\r
     SCLValue value;\r
     Type[] typeParameters;\r
@@ -232,7 +232,7 @@ public class EConstant extends Expression {
             return this;\r
         }\r
         else\r
-            return this;\r
+            return applyPUnit(context.getCompilationContext());\r
     }\r
 \r
     @Override\r
@@ -283,4 +283,11 @@ public class EConstant extends Expression {
         return transformer.transform(this);\r
     }\r
 \r
+    @Override\r
+    public boolean equalsExpression(Expression expression) {\r
+        if(expression.getClass() != getClass())\r
+            return false;\r
+        EConstant other = (EConstant)expression;\r
+        return value == other.value && Types.equals(typeParameters, other.typeParameters);\r
+    }\r
 }\r