(refs #7278, refs #7279) Small fixes to InternalCompilerExceptions

[simantics/platform.git] / bundles / org.simantics.scl.compiler / src / org / simantics / scl / compiler / internal / elaboration / decomposed / DecomposedExpression.java

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/elaboration/decomposed/DecomposedExpression.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/elaboration/decomposed/DecomposedExpression.java
index f579d5c7688699c66ca5ff8cfed06b067fbb70af..64e859253d39e16cbe62282b7f39355dd4f0553f 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/elaboration/decomposed/DecomposedExpression.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/elaboration/decomposed/DecomposedExpression.java
@@ -1,71 +1,72 @@
-package org.simantics.scl.compiler.internal.elaboration.decomposed;\r
-\r
-import java.util.ArrayList;\r
-\r
-import org.simantics.scl.compiler.common.exceptions.InternalCompilerError;\r
-import org.simantics.scl.compiler.elaboration.expressions.ELambdaType;\r
-import org.simantics.scl.compiler.elaboration.expressions.ESimpleLambda;\r
-import org.simantics.scl.compiler.elaboration.expressions.Expression;\r
-import org.simantics.scl.compiler.elaboration.expressions.Variable;\r
-import org.simantics.scl.compiler.top.SCLCompilerConfiguration;\r
-import org.simantics.scl.compiler.types.TVar;\r
-import org.simantics.scl.compiler.types.Type;\r
-import org.simantics.scl.compiler.types.Types;\r
-\r
-public class DecomposedExpression {\r
-    public final TVar[] typeParameters;\r
-    public final Variable[] parameters;\r
-    public final Type[] parameterTypes;\r
-    public final Type effect;\r
-    public final Type returnType;\r
-    public final Expression body;\r
-    \r
-    public DecomposedExpression(TVar[] typeParameters, Variable[] parameters,\r
-            Type[] parameterTypes, Type effect, Type returnType, Expression body) {\r
-        super();\r
-        if(SCLCompilerConfiguration.DEBUG)\r
-            if(effect == null)\r
-                throw new InternalCompilerError();\r
-        this.typeParameters = typeParameters;\r
-        this.parameters = parameters;\r
-        this.parameterTypes = parameterTypes;\r
-        this.effect = effect;\r
-        this.returnType = returnType;\r
-        this.body = body;\r
-    }\r
-\r
-    public static DecomposedExpression decompose(Expression expression) {\r
-        ArrayList<TVar> typeParameterList = new ArrayList<TVar>();\r
-        ArrayList<Variable> parameterList = new ArrayList<Variable>();\r
-        Type effect = Types.NO_EFFECTS;\r
-        while(true) {\r
-            if(expression instanceof ESimpleLambda) {\r
-                ESimpleLambda lambda = (ESimpleLambda)expression;\r
-                parameterList.add(lambda.parameter);\r
-                expression = lambda.value;\r
-                if(Types.canonical(effect) != Types.NO_EFFECTS)\r
-                    throw new InternalCompilerError();\r
-                effect = Types.simplifyFinalEffect(lambda.getLocalEffect());\r
-            } \r
-            else if(expression instanceof ELambdaType) {\r
-                ELambdaType lambda = (ELambdaType)expression;\r
-                expression = lambda.value;\r
-                for(TVar parameter : lambda.parameters)\r
-                    typeParameterList.add(parameter);\r
-            }\r
-            else \r
-                break;\r
-        }      \r
-        \r
-        TVar[] typeParameters = typeParameterList.isEmpty() ? TVar.EMPTY_ARRAY : \r
-            typeParameterList.toArray(new TVar[typeParameterList.size()]);\r
-        Variable[] parameters = parameterList.toArray(new Variable[parameterList.size()]);\r
-        Type[] parameterTypes = Types.getTypes(parameters);\r
-        Type returnType = expression.getType();\r
-        \r
-        return new DecomposedExpression(\r
-                typeParameters, parameters, \r
-                parameterTypes, effect, returnType, \r
-                expression);\r
-    }\r
-}\r
+package org.simantics.scl.compiler.internal.elaboration.decomposed;
+
+import java.util.ArrayList;
+
+import org.simantics.scl.compiler.common.exceptions.InternalCompilerError;
+import org.simantics.scl.compiler.elaboration.expressions.ELambdaType;
+import org.simantics.scl.compiler.elaboration.expressions.ESimpleLambda;
+import org.simantics.scl.compiler.elaboration.expressions.Expression;
+import org.simantics.scl.compiler.elaboration.expressions.Variable;
+import org.simantics.scl.compiler.errors.ErrorLog;
+import org.simantics.scl.compiler.top.SCLCompilerConfiguration;
+import org.simantics.scl.compiler.types.TVar;
+import org.simantics.scl.compiler.types.Type;
+import org.simantics.scl.compiler.types.Types;
+
+public class DecomposedExpression {
+    public final TVar[] typeParameters;
+    public final Variable[] parameters;
+    public final Type[] parameterTypes;
+    public final Type effect;
+    public final Type returnType;
+    public final Expression body;
+    
+    public DecomposedExpression(TVar[] typeParameters, Variable[] parameters,
+            Type[] parameterTypes, Type effect, Type returnType, Expression body) {
+        super();
+        if(SCLCompilerConfiguration.DEBUG)
+            if(effect == null)
+                throw new InternalCompilerError();
+        this.typeParameters = typeParameters;
+        this.parameters = parameters;
+        this.parameterTypes = parameterTypes;
+        this.effect = effect;
+        this.returnType = returnType;
+        this.body = body;
+    }
+
+    public static DecomposedExpression decompose(ErrorLog errorLog, Expression expression) {
+        ArrayList<TVar> typeParameterList = new ArrayList<TVar>();
+        ArrayList<Variable> parameterList = new ArrayList<Variable>();
+        Type effect = Types.NO_EFFECTS;
+        while(true) {
+            if(expression instanceof ESimpleLambda) {
+                ESimpleLambda lambda = (ESimpleLambda)expression;
+                parameterList.add(lambda.parameter);
+                if(Types.canonical(effect) != Types.NO_EFFECTS)
+                    errorLog.logWarning(expression.location, "Encountered nested lambdas where outermost lambda contains effects. The reason is probably in the subsumption solver and code should be OK.");
+                expression = lambda.value;
+                effect = Types.simplifyFinalEffect(lambda.getLocalEffect());
+            } 
+            else if(expression instanceof ELambdaType) {
+                ELambdaType lambda = (ELambdaType)expression;
+                expression = lambda.value;
+                for(TVar parameter : lambda.parameters)
+                    typeParameterList.add(parameter);
+            }
+            else 
+                break;
+        }      
+        
+        TVar[] typeParameters = typeParameterList.isEmpty() ? TVar.EMPTY_ARRAY : 
+            typeParameterList.toArray(new TVar[typeParameterList.size()]);
+        Variable[] parameters = parameterList.toArray(new Variable[parameterList.size()]);
+        Type[] parameterTypes = Types.getTypes(parameters);
+        Type returnType = expression.getType();
+        
+        return new DecomposedExpression(
+                typeParameters, parameters, 
+                parameterTypes, effect, returnType, 
+                expression);
+    }
+}