X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=bundles%2Forg.simantics.scl.compiler%2Fsrc%2Forg%2Fsimantics%2Fscl%2Fcompiler%2Finternal%2Fparsing%2Fparser%2FSCLParserImpl.java;h=08200a44dfd59bd50d5ea788c649abcf7e8ca146;hb=3d043320cdee8dda92758f4ea1c324a82c7d9094;hp=bda298bd661afd593eb59fc5766f9a6b72ba46da;hpb=d9a283acefae11c2cc094ed1c7b74759f8166f17;p=simantics%2Fplatform.git

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParserImpl.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParserImpl.java
index bda298bd6..08200a44d 100644
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParserImpl.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParserImpl.java
@@ -57,6 +57,7 @@ import org.simantics.scl.compiler.elaboration.expressions.accessor.FieldAccessor
 import org.simantics.scl.compiler.elaboration.expressions.accessor.IdAccessor;
 import org.simantics.scl.compiler.elaboration.expressions.accessor.StringAccessor;
 import org.simantics.scl.compiler.elaboration.expressions.block.BindStatement;
+import org.simantics.scl.compiler.elaboration.expressions.block.BlockType;
 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;
@@ -110,6 +111,7 @@ import org.simantics.scl.compiler.internal.parsing.types.TEffectAst;
 import org.simantics.scl.compiler.internal.parsing.types.TForAllAst;
 import org.simantics.scl.compiler.internal.parsing.types.TFunctionAst;
 import org.simantics.scl.compiler.internal.parsing.types.TListAst;
+import org.simantics.scl.compiler.internal.parsing.types.TPlainEffectAst;
 import org.simantics.scl.compiler.internal.parsing.types.TPredAst;
 import org.simantics.scl.compiler.internal.parsing.types.TTupleAst;
 import org.simantics.scl.compiler.internal.parsing.types.TVarAst;
@@ -128,6 +130,10 @@ public class SCLParserImpl extends SCLParser {
         this.lexer = new SCLPostLexer(reader);
     }
     
+    public SCLPostLexer getLexer() {
+        return lexer;
+    }
+    
     public void setCompilationContext(CompilationContext context) {
         this.context = context;
         lexer.setCompilationContext(context);
@@ -761,7 +767,14 @@ public class SCLParserImpl extends SCLParser {
     protected Object reduceDo() {
         EBlock block = (EBlock)get(1);
         Token doToken = (Token)get(0);
-        block.setMonadic( doToken.text.equals("mdo") );
+        switch(doToken.text) {
+        case "mdo":
+            block.setBlockType(BlockType.Monad);
+            break;
+        case "edo":
+            block.setBlockType(BlockType.MonadE);
+            break;
+        }
         block.location = Locations.location(Locations.beginOf(doToken.location), Locations.endOf(block.location));
         return block;
     }
@@ -810,6 +823,16 @@ public class SCLParserImpl extends SCLParser {
     protected Object reduceGreater() {
         return new EVar(((Token)get(0)).text);
     }
+    
+    @Override
+    protected Object reduceDoubleLess() {
+        return new EVar(((Token)get(0)).text);
+    }
+
+    @Override
+    protected Object reduceDoubleGreater() {
+        return new EVar(((Token)get(0)).text);
+    }
 
     @Override
     protected Object reduceDot() {
@@ -1339,4 +1362,21 @@ public class SCLParserImpl extends SCLParser {
         return new CHRStatement((CHRAstQuery)get(0), (CHRAstQuery)get(2));
     }
 
+    @Override
+    protected Object reduceWildcard() {
+        return new FieldAssignment(FieldAssignment.WILDCARD, null);
+    }
+
+    @Override
+    protected Object reducePlainEffect() {
+        ArrayList<TypeAst> effects = new ArrayList<TypeAst>(length()/2);
+        for(int i=1;i<length();i+=2) {
+            Token token = (Token)get(i);
+            TVarAst ast = new TVarAst(token.text);
+            ast.location = token.location;
+            effects.add(ast);
+        }
+        return new TPlainEffectAst(effects);
+    }
+
 }