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%2FEBlock.java;h=fb5c2bdfaf1ca6ce0777d5f5aeeea2c066fe82ae;hp=ff131254081f7c4ce0a27b3bf9a18cf29fbc9195;hb=a8758de5bc19e5adb3f618d3038743a164f09912;hpb=12d9af17384d960b75d58c3935d2b7b46d93e87b

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EBlock.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EBlock.java
index ff1312540..fb5c2bdfa 100755
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EBlock.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/elaboration/expressions/EBlock.java
@@ -5,11 +5,16 @@ import java.util.LinkedList;
 import java.util.List;
 
 import org.simantics.scl.compiler.common.exceptions.InternalCompilerError;
+import org.simantics.scl.compiler.elaboration.chr.CHRRuleset;
+import org.simantics.scl.compiler.elaboration.chr.translation.CHRTranslation;
 import org.simantics.scl.compiler.elaboration.contexts.TranslationContext;
+import org.simantics.scl.compiler.elaboration.expressions.block.CHRStatement;
+import org.simantics.scl.compiler.elaboration.expressions.block.ConstraintStatement;
 import org.simantics.scl.compiler.elaboration.expressions.block.GuardStatement;
 import org.simantics.scl.compiler.elaboration.expressions.block.LetStatement;
 import org.simantics.scl.compiler.elaboration.expressions.block.RuleStatement;
 import org.simantics.scl.compiler.elaboration.expressions.block.Statement;
+import org.simantics.scl.compiler.elaboration.expressions.block.StatementGroup;
 import org.simantics.scl.compiler.errors.Locations;
 
 public class EBlock extends ASTExpression {
@@ -34,10 +39,8 @@ public class EBlock extends ASTExpression {
 
     @Override
     public Expression resolve(TranslationContext context) {
-        if(statements.isEmpty()) {
-            context.getErrorLog().log(location, "Block must contain at least one statement.");
-            return new EError(location);
-        } 
+        if(statements.isEmpty())
+            throw new InternalCompilerError();
         int i = statements.size()-1;
         Statement last = statements.get(i);
         if(!(last instanceof GuardStatement)) {
@@ -48,21 +51,25 @@ public class EBlock extends ASTExpression {
         Expression in = ((GuardStatement)last).value;
         while(--i >= 0) {
             Statement cur = statements.get(i);
-            if(cur instanceof RuleStatement) {
-                int endId = i+1;
-                while(i>0 && statements.get(i-1) instanceof RuleStatement)
-                    --i;
-                in = extractRules(i, endId, in);
-            }
-            else if(cur instanceof LetStatement && ((LetStatement)cur).pattern.isFunctionPattern()) {
+            StatementGroup group = cur.getStatementGroup();
+            if(group == null)
+                in = cur.toExpression(context, monadic, in);
+            else {
                 int endId = i+1;
-                while(i>0 && (cur = statements.get(i-1)) instanceof LetStatement &&
-                        ((LetStatement)cur).pattern.isFunctionPattern())
+                while(i>0 && statements.get(i-1).getStatementGroup() == group)
                     --i;
-                in = extractLet(i, endId, in);
+                switch(group) {
+                case LetFunction:
+                    in = extractLet(i, endId, in);
+                    break;
+                case Rule:
+                    in = extractRules(i, endId, in);
+                    break;
+                case CHR:
+                    in = extractCHRRules(context, i, endId, in);
+                    break;
+                }
             }
-            else
-                in = cur.toExpression(context, monadic, in);
         }
         return in.resolve(context);
     }
@@ -70,6 +77,21 @@ public class EBlock extends ASTExpression {
     private Expression extractRules(int begin, int end, Expression in) {
         return new EPreRuleset(statements.subList(begin, end).toArray(new RuleStatement[end-begin]), in);
     }
+    
+    private Expression extractCHRRules(TranslationContext context, int begin, int end, Expression in) {
+        CHRRuleset ruleset = new CHRRuleset();
+        ruleset.location = Locations.combine(statements.get(begin).location, statements.get(end-1).location);
+        for(int i=begin;i<end;++i) {
+            Statement statement = statements.get(i);
+            if(statement instanceof CHRStatement)
+                ruleset.rules.add(CHRTranslation.convertCHRStatement(context, (CHRStatement)statement));
+            else if(statement instanceof ConstraintStatement)
+                ruleset.constraints.add(CHRTranslation.convertConstraintStatement(context, (ConstraintStatement)statement));
+            else
+                throw new InternalCompilerError("Invalid CHR statement.");
+        }
+        return new ECHRRuleset(ruleset, in);
+    }
 
     @SuppressWarnings("unchecked")
     private Expression extractLet(int begin, int end, Expression in) {