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%2FEBinary.java;h=58274a7a0269553521a840af33b5362faf6d8a70;hp=e74dde7f6df929fc766b4a8f755b120a6172286c;hb=a8758de5bc19e5adb3f618d3038743a164f09912;hpb=12d9af17384d960b75d58c3935d2b7b46d93e87b diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EBinary.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EBinary.java index e74dde7f6..58274a7a0 100755 --- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EBinary.java +++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EBinary.java @@ -3,7 +3,7 @@ package org.simantics.scl.compiler.elaboration.expressions; import java.util.ArrayList; import org.simantics.scl.compiler.common.exceptions.InternalCompilerError; -import org.simantics.scl.compiler.common.names.Name; +import org.simantics.scl.compiler.common.names.Names; import org.simantics.scl.compiler.common.precedence.Associativity; import org.simantics.scl.compiler.common.precedence.Precedence; import org.simantics.scl.compiler.elaboration.contexts.TranslationContext; @@ -46,8 +46,6 @@ public class EBinary extends ASTExpression { public Expression resolve(TranslationContext context) { return parseOperators(context).resolve(context); } - - private static final Name NEG = Name.create("Prelude", "neg"); public Expression parseOperators(TranslationContext context) { ArrayList output = new ArrayList(); @@ -87,7 +85,7 @@ public class EBinary extends ASTExpression { } if(negation != null && ops.isEmpty()) { if(opPrec.level <= NEGATION_LEVEL) { - SCLValue neg = context.getEnvironment().getValue(NEG); + SCLValue neg = context.getEnvironment().getValue(Names.Prelude_neg); if(neg == null) { context.getErrorLog().log(location, "Couldn't resolve variable neg."); @@ -112,7 +110,7 @@ public class EBinary extends ASTExpression { output.add(binary(l, oldOp, opAsts.remove(opAsts.size()-1), r)); } if(negation != null) { - SCLValue neg = context.getEnvironment().getValue(NEG); + SCLValue neg = context.getEnvironment().getValue(Names.Prelude_neg); if(neg == null) { context.getErrorLog().log(location, "Couldn't resolve variable neg.");