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%2FERealLiteral.java;h=4860055c19d3fecc0ae04d9d0202383951c73175;hp=bbc9d52ba7620add7859dccaf6b82c19d83b68a0;hb=747231cca0974ca9ed5f78caa6517ee9dcb8e4fc;hpb=ca40974f87c9db00eb77aaf1acc1e9937b37261b

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ERealLiteral.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ERealLiteral.java
old mode 100755
new mode 100644
index bbc9d52ba..4860055c1
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ERealLiteral.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ERealLiteral.java
@@ -1,149 +1,143 @@
-package org.simantics.scl.compiler.elaboration.expressions;
-
-
-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.elaboration.contexts.ReplaceContext;
-import org.simantics.scl.compiler.elaboration.contexts.SimplificationContext;
-import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
-import org.simantics.scl.compiler.elaboration.contexts.TypingContext;
-import org.simantics.scl.compiler.errors.ErrorLog;
-import org.simantics.scl.compiler.errors.Locations;
-import org.simantics.scl.compiler.internal.elaboration.utils.ExpressionDecorator;
-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 ERealLiteral extends SimplifiableExpression {
-    public String value;
-    EVariable constraint;
-
-    public ERealLiteral(String value) {
-        this.value = value;
-    }
-
-    @Override
-    public void collectRefs(TObjectIntHashMap<Object> allRefs,
-            TIntHashSet refs) {
-    }
-
-    @Override
-    public void collectVars(TObjectIntHashMap<Variable> allVars,
-            TIntHashSet vars) {
-    }
-
-    private Expression tryToConvertToPrimitive(ErrorLog errorLog, Type requiredType) {
-        if(requiredType.equals(Types.DOUBLE))
-            return new ELiteral(new DoubleConstant(Double.parseDouble(value)));
-        else if(requiredType.equals(Types.FLOAT))
-            return new ELiteral(new FloatConstant(Float.parseFloat(value)));
-        else if(requiredType.equals(Types.INTEGER)) {
-            errorLog.log(location, "Cannot convert real literal to Integer.");
-            return new EError();
-        }
-        else if(requiredType.equals(Types.LONG)) {
-            errorLog.log(location, "Cannot convert real literal to Long.");
-            return new EError();
-        }
-        else
-            return null;
-    }
-    
-    @Override
-    public Expression checkBasicType(TypingContext context, Type requiredType) {
-        requiredType = Types.canonical(requiredType);
-        Expression primitive = tryToConvertToPrimitive(context.getErrorLog(), requiredType);
-        if(primitive != null)
-            return primitive;
-        else {
-            setType(requiredType);        
-            constraint = new EVariable(location, null);
-            constraint.setType(Types.pred(Types.REAL, requiredType));
-            context.addConstraintDemand(constraint);
-            return this;
-        }
-    }
-
-    @Override
-    protected void updateType() throws MatchException {
-        throw new InternalCompilerError("TODO");
-    }
-    
-    @Override
-    public void collectFreeVariables(THashSet<Variable> vars) {
-    }
-
-    @Override
-    public Expression simplify(SimplificationContext context) {
-        Expression primitive = tryToConvertToPrimitive(context.getErrorLog(), getType());
-        if(primitive != null)
-            return primitive;
-        return context.apply(
-                context.getConstant(Names.Prelude_fromDouble, getType()),
-                constraint.simplify(context),
-                context.literal(new DoubleConstant(Double.parseDouble(value)))
-                );
-    }
-
-    @Override
-    public Expression resolve(TranslationContext context) {
-        return this;
-    }
-    
-    @Override
-    public Expression resolveAsPattern(TranslationContext context) {
-        return new ELiteral(new DoubleConstant(Double.parseDouble(value)));
-    }
-    
-    @Override
-    public Expression replace(ReplaceContext context) {
-        ERealLiteral copy = new ERealLiteral(value);
-        copy.setType(getType().replace(context.tvarMap));
-        return copy;
-    }
-    
-    @Override
-    public Expression decorate(ExpressionDecorator decorator) {     
-        return decorator.decorate(this);
-    }
-
-    @Override
-    public void collectEffects(THashSet<Type> effects) {
-    }
-    
-    @Override
-    public void setLocationDeep(long loc) {
-        if(location == Locations.NO_LOCATION) {
-            location = loc;
-            if(constraint != null)
-                constraint.setLocationDeep(loc);
-        }
-    }
-    
-    @Override
-    public void accept(ExpressionVisitor visitor) {
-        visitor.visit(this);
-    }
-
-    public String getValue() {
-        return value;
-    }
-
-    @Override
-    public void forVariables(VariableProcedure procedure) {
-        if(constraint != null)
-            constraint.forVariables(procedure);
-    }
-    
-    @Override
-    public Expression accept(ExpressionTransformer transformer) {
-        return transformer.transform(this);
-    }
-
-}
+package org.simantics.scl.compiler.elaboration.expressions;
+
+
+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.elaboration.contexts.ReplaceContext;
+import org.simantics.scl.compiler.elaboration.contexts.SimplificationContext;
+import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
+import org.simantics.scl.compiler.elaboration.contexts.TypingContext;
+import org.simantics.scl.compiler.errors.ErrorLog;
+import org.simantics.scl.compiler.errors.Locations;
+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 ERealLiteral extends SimplifiableExpression {
+    public String value;
+    EVariable constraint;
+
+    public ERealLiteral(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public void collectRefs(TObjectIntHashMap<Object> allRefs,
+            TIntHashSet refs) {
+    }
+
+    @Override
+    public void collectVars(TObjectIntHashMap<Variable> allVars,
+            TIntHashSet vars) {
+    }
+
+    private Expression tryToConvertToPrimitive(ErrorLog errorLog, Type requiredType) {
+        if(requiredType.equals(Types.DOUBLE))
+            return new ELiteral(new DoubleConstant(Double.parseDouble(value)));
+        else if(requiredType.equals(Types.FLOAT))
+            return new ELiteral(new FloatConstant(Float.parseFloat(value)));
+        else if(requiredType.equals(Types.INTEGER)) {
+            errorLog.log(location, "Cannot convert real literal to Integer.");
+            return new EError();
+        }
+        else if(requiredType.equals(Types.LONG)) {
+            errorLog.log(location, "Cannot convert real literal to Long.");
+            return new EError();
+        }
+        else
+            return null;
+    }
+    
+    @Override
+    public Expression checkBasicType(TypingContext context, Type requiredType) {
+        requiredType = Types.canonical(requiredType);
+        Expression primitive = tryToConvertToPrimitive(context.getErrorLog(), requiredType);
+        if(primitive != null)
+            return primitive;
+        else {
+            setType(requiredType);        
+            constraint = new EVariable(location, null);
+            constraint.setType(Types.pred(Types.REAL, requiredType));
+            context.addConstraintDemand(constraint);
+            return this;
+        }
+    }
+
+    @Override
+    protected void updateType() throws MatchException {
+        throw new InternalCompilerError("TODO");
+    }
+    
+    @Override
+    public void collectFreeVariables(THashSet<Variable> vars) {
+    }
+
+    @Override
+    public Expression simplify(SimplificationContext context) {
+        Expression primitive = tryToConvertToPrimitive(context.getErrorLog(), getType());
+        if(primitive != null)
+            return primitive;
+        return context.apply(
+                context.getConstant(Names.Prelude_fromDouble, getType()),
+                constraint.simplify(context),
+                context.literal(new DoubleConstant(Double.parseDouble(value)))
+                );
+    }
+
+    @Override
+    public Expression resolve(TranslationContext context) {
+        return this;
+    }
+    
+    @Override
+    public Expression resolveAsPattern(TranslationContext context) {
+        return new ELiteral(new DoubleConstant(Double.parseDouble(value)));
+    }
+    
+    @Override
+    public Expression replace(ReplaceContext context) {
+        ERealLiteral copy = new ERealLiteral(value);
+        copy.setType(getType().replace(context.tvarMap));
+        return copy;
+    }
+
+    @Override
+    public void collectEffects(THashSet<Type> effects) {
+    }
+    
+    @Override
+    public void setLocationDeep(long loc) {
+        if(location == Locations.NO_LOCATION) {
+            location = loc;
+            if(constraint != null)
+                constraint.setLocationDeep(loc);
+        }
+    }
+    
+    @Override
+    public void accept(ExpressionVisitor visitor) {
+        visitor.visit(this);
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    @Override
+    public void forVariables(VariableProcedure procedure) {
+        if(constraint != null)
+            constraint.forVariables(procedure);
+    }
+    
+    @Override
+    public Expression accept(ExpressionTransformer transformer) {
+        return transformer.transform(this);
+    }
+
+}