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%2FELet.java;h=a90c6186d78f8e1e2690d5dab745d56cde171de7;hp=d10066f90047a303bb2462089ae2a5d987c217f6;hb=292e64ba21f8044df19884dc3e61fe5e292a82df;hpb=1b4d8b692f40d946deb5db8280eb4ca5b36a75a7

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ELet.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ELet.java
old mode 100755
new mode 100644
index d10066f90..a90c6186d
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ELet.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/ELet.java
@@ -3,11 +3,11 @@ package org.simantics.scl.compiler.elaboration.expressions;
 import java.util.ArrayList;
 
 import org.simantics.scl.compiler.common.exceptions.InternalCompilerError;
+import org.simantics.scl.compiler.compilation.CompilationContext;
 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.environment.Environment;
 import org.simantics.scl.compiler.errors.Locations;
 import org.simantics.scl.compiler.internal.codegen.references.BoundVar;
 import org.simantics.scl.compiler.internal.codegen.references.IVal;
@@ -25,6 +25,9 @@ import gnu.trove.map.hash.TObjectIntHashMap;
 import gnu.trove.set.hash.THashSet;
 import gnu.trove.set.hash.TIntHashSet;
 
+/**
+ * Generated maily from EPreLet
+ */
 public class ELet extends Expression {
     public Assignment[] assignments;
     public Expression in;
@@ -147,7 +150,7 @@ public class ELet extends Expression {
     }
     
     @Override
-    public IVal toVal(Environment env, CodeWriter w) {
+    public IVal toVal(CompilationContext context, CodeWriter w) {
         // Create bound variables
         BoundVar[] vars = new BoundVar[assignments.length];
         for(int i=0;i<assignments.length;++i) {
@@ -168,7 +171,7 @@ public class ELet extends Expression {
         rdw.setLocation(range);
         for(int i=0;i<assignments.length;++i) {
             DecomposedExpression decomposed = 
-                    DecomposedExpression.decompose(assignments[i].value);
+                    DecomposedExpression.decompose(context.errorLog, assignments[i].value);
             CodeWriter newW = rdw.createFunction(vars[i], 
                     decomposed.typeParameters,
                     decomposed.effect,
@@ -177,9 +180,9 @@ public class ELet extends Expression {
             IVal[] parameters = newW.getParameters();
             for(int j=0;j<parameters.length;++j)
                 decomposed.parameters[j].setVal(parameters[j]);
-            newW.return_(decomposed.body.toVal(env, newW));
+            newW.return_(decomposed.body.toVal(context, newW));
         }
-        return in.toVal(env, w);
+        return in.toVal(context, w);
     }
         
     private void checkAssignments(TypingContext context) {