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%2FEPreLet.java;h=c78b9f4572bda462183776f8e7cc140694eaa2ec;hp=64d5cc3c64126675f950fddb467fa7abefdeb0ec;hb=1b4d8b692f40d946deb5db8280eb4ca5b36a75a7;hpb=969bd23cab98a79ca9101af33334000879fb60c5

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EPreLet.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EPreLet.java
index 64d5cc3c6..c78b9f457 100755
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EPreLet.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EPreLet.java
@@ -1,97 +1,102 @@
-package org.simantics.scl.compiler.elaboration.expressions;
-
-import gnu.trove.map.hash.THashMap;
-import gnu.trove.procedure.TObjectObjectProcedure;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
-import org.simantics.scl.compiler.elaboration.errors.NotPatternException;
-import org.simantics.scl.compiler.elaboration.expressions.block.LetStatement;
-import org.simantics.scl.compiler.elaboration.expressions.lhstype.FunctionDefinitionLhs;
-import org.simantics.scl.compiler.elaboration.expressions.lhstype.LhsType;
-import org.simantics.scl.compiler.errors.Locations;
-
-public class EPreLet extends ASTExpression {
-
-    List<LetStatement> assignments;
-    Expression in;
-    
-    public EPreLet(List<LetStatement> assignments, Expression in) {
-        this.assignments = assignments;
-        this.in = in;
-    }
-    
-    @Override
-    public Expression resolve(final TranslationContext context) {
-        context.pushFrame();
-        THashMap<String, ArrayList<LetStatement>> functionDefinitions =
-                new THashMap<String, ArrayList<LetStatement>>();
-        ArrayList<LetStatement> otherDefinitions = new ArrayList<LetStatement>();
-        final THashMap<String, Variable> localVars = new THashMap<String, Variable>();
-        try {
-            for(LetStatement assign : assignments) {
-                LhsType lhsType = assign.pattern.getLhsType();
-                if(!(assign.pattern instanceof EVar) && lhsType instanceof FunctionDefinitionLhs) {
-                    String name = ((FunctionDefinitionLhs)lhsType).functionName;
-                    ArrayList<LetStatement> group = functionDefinitions.get(name);
-                    if(group == null) {
-                        group = new ArrayList<LetStatement>(2);
-                        functionDefinitions.put(name, group);
-                    }
-                    group.add(assign);
-                    localVars.put(name, context.newVariable(name));
-                }
-                else {
-                    otherDefinitions.add(assign);
-                    assign.pattern = assign.pattern.resolveAsPattern(context);
-                }
-            }
-        } catch (NotPatternException e) {
-            context.getErrorLog().log(e.getExpression().location, "Not a pattern.");
-            return new EError();
-        }
-        
-        final ArrayList<Assignment> as = new ArrayList<Assignment>(functionDefinitions.size() + otherDefinitions.size());
-        functionDefinitions.forEachEntry(new TObjectObjectProcedure<String, ArrayList<LetStatement>>() {
-            @Override
-            public boolean execute(String name, ArrayList<LetStatement> cases) {
-                as.add(new Assignment(
-                        new EVariable(cases.size()==1 ? cases.get(0).pattern.location : location, localVars.get(name)), 
-                        context.translateCases(cases)));
-                return true;
-            }
-        });
-        for(LetStatement stat : otherDefinitions)
-            as.add(new Assignment(
-                    stat.pattern /* already resolved above */, 
-                    stat.value.resolve(context)));
-        Expression inExpr = in.resolve(context);
-        context.popFrame();
-        
-        ELet result = new ELet(location, as.toArray(new Assignment[as.size()]), inExpr);
-        /*System.out.println("-----------------------------------------");
-        System.out.println(this);
-        System.out.println("-----------------------------------------");
-        System.out.println(result);
-        System.out.println("-----------------------------------------");*/
-        return result;
-    }
-
-    @Override
-    public void setLocationDeep(long loc) {
-        if(location == Locations.NO_LOCATION) {
-            location = loc;
-            for(LetStatement assignment : assignments)
-                assignment.setLocationDeep(loc);
-            in.setLocationDeep(loc);
-        }
-    }
-    
-    @Override
-    public Expression accept(ExpressionTransformer transformer) {
-        return transformer.transform(this);
-    }
-
-}
+package org.simantics.scl.compiler.elaboration.expressions;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
+import org.simantics.scl.compiler.elaboration.errors.NotPatternException;
+import org.simantics.scl.compiler.elaboration.expressions.block.LetStatement;
+import org.simantics.scl.compiler.elaboration.expressions.lhstype.FunctionDefinitionLhs;
+import org.simantics.scl.compiler.elaboration.expressions.lhstype.LhsType;
+import org.simantics.scl.compiler.errors.Locations;
+
+import gnu.trove.map.hash.THashMap;
+import gnu.trove.procedure.TObjectObjectProcedure;
+
+public class EPreLet extends ASTExpression {
+
+    List<LetStatement> assignments;
+    Expression in;
+    
+    public EPreLet(List<LetStatement> assignments, Expression in) {
+        this.assignments = assignments;
+        this.in = in;
+    }
+    
+    @Override
+    public Expression resolve(final TranslationContext context) {
+        context.pushFrame();
+        THashMap<String, ArrayList<LetStatement>> functionDefinitions =
+                new THashMap<String, ArrayList<LetStatement>>();
+        ArrayList<LetStatement> otherDefinitions = new ArrayList<LetStatement>();
+        final THashMap<String, Variable> localVars = new THashMap<String, Variable>();
+        try {
+            for(LetStatement assign : assignments) {
+                LhsType lhsType = assign.pattern.getLhsType();
+                if(!(assign.pattern instanceof EVar) && lhsType instanceof FunctionDefinitionLhs) {
+                    String name = ((FunctionDefinitionLhs)lhsType).functionName;
+                    ArrayList<LetStatement> group = functionDefinitions.get(name);
+                    if(group == null) {
+                        group = new ArrayList<LetStatement>(2);
+                        functionDefinitions.put(name, group);
+                    }
+                    group.add(assign);
+                    localVars.put(name, context.newVariable(name));
+                }
+                else {
+                    otherDefinitions.add(assign);
+                    assign.pattern = assign.pattern.resolveAsPattern(context);
+                }
+            }
+        } catch (NotPatternException e) {
+            context.getErrorLog().log(e.getExpression().location, "Not a pattern.");
+            return new EError();
+        }
+        
+        final ArrayList<Assignment> as = new ArrayList<Assignment>(functionDefinitions.size() + otherDefinitions.size());
+        functionDefinitions.forEachEntry(new TObjectObjectProcedure<String, ArrayList<LetStatement>>() {
+            @Override
+            public boolean execute(String name, ArrayList<LetStatement> cases) {
+                as.add(new Assignment(
+                        new EVariable(cases.size()==1 ? cases.get(0).pattern.location : location, localVars.get(name)), 
+                        context.translateCases(cases)));
+                return true;
+            }
+        });
+        for(LetStatement stat : otherDefinitions)
+            as.add(new Assignment(
+                    stat.pattern /* already resolved above */, 
+                    stat.value.resolve(context)));
+        Expression inExpr = in.resolve(context);
+        context.popFrame();
+        
+        ELet result = new ELet(location, as.toArray(new Assignment[as.size()]), inExpr);
+        /*System.out.println("-----------------------------------------");
+        System.out.println(this);
+        System.out.println("-----------------------------------------");
+        System.out.println(result);
+        System.out.println("-----------------------------------------");*/
+        return result;
+    }
+
+    @Override
+    public void setLocationDeep(long loc) {
+        if(location == Locations.NO_LOCATION) {
+            location = loc;
+            for(LetStatement assignment : assignments)
+                assignment.setLocationDeep(loc);
+            in.setLocationDeep(loc);
+        }
+    }
+    
+    @Override
+    public Expression accept(ExpressionTransformer transformer) {
+        return transformer.transform(this);
+    }
+    
+    @Override
+    public int getSyntacticFunctionArity() {
+        return in.getSyntacticFunctionArity();
+    }
+
+}