X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Felaboration%2Fexpressions%2FEIntegerLiteral.java;h=0834c49053a76813ee1cc0683d7d5098769972c7;hp=7ccd66d0a3b8240fd25d70b37bb56bca94e07cf5;hb=1b4d8b692f40d946deb5db8280eb4ca5b36a75a7;hpb=969bd23cab98a79ca9101af33334000879fb60c5 diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EIntegerLiteral.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EIntegerLiteral.java index 7ccd66d0a..0834c4905 100755 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EIntegerLiteral.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EIntegerLiteral.java @@ -1,11 +1,8 @@ package org.simantics.scl.compiler.elaboration.expressions; -import gnu.trove.map.hash.TObjectIntHashMap; -import gnu.trove.set.hash.THashSet; -import gnu.trove.set.hash.TIntHashSet; - import org.simantics.scl.compiler.common.exceptions.InternalCompilerError; +import org.simantics.scl.compiler.common.names.Names; import org.simantics.scl.compiler.constants.DoubleConstant; import org.simantics.scl.compiler.constants.FloatConstant; import org.simantics.scl.compiler.constants.IntegerConstant; @@ -20,6 +17,10 @@ import org.simantics.scl.compiler.types.Type; import org.simantics.scl.compiler.types.Types; import org.simantics.scl.compiler.types.exceptions.MatchException; +import gnu.trove.map.hash.TObjectIntHashMap; +import gnu.trove.set.hash.THashSet; +import gnu.trove.set.hash.TIntHashSet; + public class EIntegerLiteral extends SimplifiableExpression { public String value; EVariable constraint; @@ -90,7 +91,7 @@ public class EIntegerLiteral extends SimplifiableExpression { if(primitive != null) return primitive; return context.apply( - context.getConstant(SimplificationContext.FROM_INTEGER, getType()), + context.getConstant(Names.Prelude_fromInteger, getType()), constraint.simplify(context), context.literal(new IntegerConstant(Integer.parseInt(value))) );