New SCL syntax <<effects>>

Change-Id: Iec61620d424e583b854a743ccc4ac37dc8e8f56f

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCL.grammar b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCL.grammar
index 01a66a9ee2fa844722624ce664bcd19e332c2a68..3b3d5f7db3375beb39967744ddd3a43de7a02a92 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCL.grammar
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCL.grammar
@@ -300,6 +300,7 @@ btype
 
 atype
     = ID                                                     # TypeVar
 
 atype
     = ID                                                     # TypeVar

+    | DOUBLE_LESS ID (COMMA ID)* DOUBLE_GREATER              # PlainEffect

     | LPAREN (type (COMMA type)*)? RPAREN                    # TupleType
     | LBRACKET type RBRACKET                                 # ListType
     | LBRACKET RBRACKET                                      # ListTypeConstructor
     | LPAREN (type (COMMA type)*)? RPAREN                    # TupleType
     | LBRACKET type RBRACKET                                 # ListType
     | LBRACKET RBRACKET                                      # ListTypeConstructor


@@ -321,6 +322,8 @@ symbol
     | MINUS                                                  # Minus
     | LESS                                                   # Less
     | GREATER                                                # Greater
     | MINUS                                                  # Minus
     | LESS                                                   # Less
     | GREATER                                                # Greater

+    | DOUBLE_LESS                                            # DoubleLess
+    | DOUBLE_GREATER                                         # DoubleGreater

     | SEPARATED_DOT                                          # Dot
     ;
     
     | SEPARATED_DOT                                          # Dot
     ;
     

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLLexer.flex b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLLexer.flex
index 595c082ca4c70151f946cf37a63353d4a078bd2e..e1abd5fd3051c509d695cd6626b6c3f40b731df3 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLLexer.flex
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLLexer.flex
@@ -158,7 +158,9 @@ char_literal    = "'" ([^'\\\ufffd] | "\\" [^\ufffd]) "'"
   "."             { return sym(SCLTerminals.ATTACHED_DOT, "."); }
   "-"             { return sym(SCLTerminals.MINUS, "-"); }
 //  "<" {existentialVar} ">" { yybegin(XML); return sym(SCLTerminals.XML_BEGIN); }
   "."             { return sym(SCLTerminals.ATTACHED_DOT, "."); }
   "-"             { return sym(SCLTerminals.MINUS, "-"); }
 //  "<" {existentialVar} ">" { yybegin(XML); return sym(SCLTerminals.XML_BEGIN); }

+  "<<"            { return sym(SCLTerminals.DOUBLE_LESS, "<<"); }

   "<"             { return sym(SCLTerminals.LESS, "<"); }
   "<"             { return sym(SCLTerminals.LESS, "<"); }

+  ">>"            { return sym(SCLTerminals.DOUBLE_GREATER, ">>"); }

   ">"             { return sym(SCLTerminals.GREATER, ">"); }
   ";"             { return sym(SCLTerminals.SEMICOLON); }
   "|"             { return sym(SCLTerminals.BAR); }
   ">"             { return sym(SCLTerminals.GREATER, ">"); }
   ";"             { return sym(SCLTerminals.SEMICOLON); }
   "|"             { return sym(SCLTerminals.BAR); }

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLLexer.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLLexer.java
index 0caade6bf77160202c519831b25f30bd2365b5e9..ca25d241a44ad00dbf8e0131033324d95bc90d0b 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLLexer.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLLexer.java
@@ -68,26 +68,26 @@ public class SCLLexer {
     "\1\23\1\24\1\25\1\26\1\27\1\30\1\31\1\32"+
     "\1\33\1\13\1\34\1\35\1\36\1\0\1\37\1\36"+
     "\1\40\2\35\2\40\5\0\1\4\1\41\1\42\1\43"+
     "\1\23\1\24\1\25\1\26\1\27\1\30\1\31\1\32"+
     "\1\33\1\13\1\34\1\35\1\36\1\0\1\37\1\36"+
     "\1\40\2\35\2\40\5\0\1\4\1\41\1\42\1\43"+

-    "\3\0\1\2\4\0\1\4\1\44\1\45\1\46\1\4"+
-    "\2\0\2\2\1\47\2\2\1\50\1\51\12\2\1\52"+
-    "\3\2\1\53\2\2\1\54\4\2\1\55\1\56\1\57"+
-    "\1\0\1\60\1\61\1\62\1\63\1\64\1\60\1\65"+
-    "\2\0\2\66\1\0\1\67\1\70\1\2\1\0\1\71"+
-    "\2\0\2\72\1\0\1\4\1\0\3\2\1\73\14\2"+
-    "\1\74\11\2\1\75\1\76\1\0\1\77\2\0\1\46"+
-    "\1\0\1\2\1\100\6\2\1\101\1\102\2\2\1\103"+
-    "\3\2\1\104\1\2\1\105\2\2\1\106\3\2\1\0"+
-    "\1\46\1\0\3\2\1\107\11\2\1\110\1\2\1\111"+
-    "\1\2\1\112\1\2\1\0\1\113\1\114\2\2\1\115"+
-    "\1\116\2\2\1\117\1\2\1\120\1\121\2\2\1\122"+
-    "\3\2\1\123\1\124\2\2\1\125\2\2\1\126\1\127"+
-    "\1\0\4\2\1\130\2\2\2\0\1\2\1\131\2\0"+
-    "\2\2\2\0\1\2\2\0\1\132\1\2\2\0\1\133"+
-    "\2\0\1\2\4\0\1\2\1\134\2\0\1\135\1\2"+
-    "\2\0\1\136\2\0\1\137\1\0\1\140";
+    "\3\0\1\2\4\0\1\44\1\4\1\45\1\46\1\47"+
+    "\1\50\1\4\2\0\2\2\1\51\2\2\1\52\1\53"+
+    "\12\2\1\54\3\2\1\55\2\2\1\56\4\2\1\57"+
+    "\1\60\1\61\1\0\1\62\1\63\1\64\1\65\1\66"+
+    "\1\62\1\67\2\0\2\70\1\0\1\71\1\72\1\2"+
+    "\1\0\1\73\2\0\2\74\1\0\1\4\1\0\3\2"+
+    "\1\75\14\2\1\76\11\2\1\77\1\100\1\0\1\101"+
+    "\2\0\1\50\1\0\1\2\1\102\6\2\1\103\1\104"+
+    "\2\2\1\105\3\2\1\106\1\2\1\107\2\2\1\110"+
+    "\3\2\1\0\1\50\1\0\3\2\1\111\11\2\1\112"+
+    "\1\2\1\113\1\2\1\114\1\2\1\0\1\115\1\116"+
+    "\2\2\1\117\1\120\2\2\1\121\1\2\1\122\1\123"+
+    "\2\2\1\124\3\2\1\125\1\126\2\2\1\127\2\2"+
+    "\1\130\1\131\1\0\4\2\1\132\2\2\2\0\1\2"+
+    "\1\133\2\0\2\2\2\0\1\2\2\0\1\134\1\2"+
+    "\2\0\1\135\2\0\1\2\4\0\1\2\1\136\2\0"+
+    "\1\137\1\2\2\0\1\140\2\0\1\141\1\0\1\142";

 
   private static int [] zzUnpackAction() {
 
   private static int [] zzUnpackAction() {

-    int [] result = new int[298];
+    int [] result = new int[300];

     int offset = 0;
     offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
     return result;
     int offset = 0;
     offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
     return result;


@@ -114,45 +114,45 @@ public class SCLLexer {
   private static final String ZZ_ROWMAP_PACKED_0 =
     "\0\0\0\76\0\174\0\272\0\272\0\370\0\u0136\0\u0174"+
     "\0\u01b2\0\u01f0\0\u022e\0\u026c\0\u02aa\0\272\0\272\0\u02e8"+
   private static final String ZZ_ROWMAP_PACKED_0 =
     "\0\0\0\76\0\174\0\272\0\272\0\370\0\u0136\0\u0174"+
     "\0\u01b2\0\u01f0\0\u022e\0\u026c\0\u02aa\0\272\0\272\0\u02e8"+

-    "\0\u0326\0\u0364\0\u03a2\0\u01b2\0\u03e0\0\u041e\0\u045c\0\272"+
-    "\0\u049a\0\u04d8\0\u0516\0\u0554\0\u0592\0\u05d0\0\u060e\0\u064c"+
-    "\0\u068a\0\u06c8\0\u0706\0\u0744\0\u0782\0\u07c0\0\u07fe\0\272"+
-    "\0\272\0\272\0\272\0\u083c\0\u087a\0\272\0\u01b2\0\u08b8"+
-    "\0\370\0\272\0\272\0\u08f6\0\u0934\0\u0972\0\272\0\272"+
-    "\0\u09b0\0\u09ee\0\u0a2c\0\u08f6\0\272\0\u0a6a\0\u0aa8\0\u0ae6"+
-    "\0\u0b24\0\u0b62\0\u0ba0\0\272\0\u0bde\0\u0c1c\0\u0c5a\0\u0c98"+
-    "\0\u0cd6\0\u0d14\0\u0d52\0\u0d90\0\u0dce\0\u0e0c\0\u0e4a\0\u01b2"+
-    "\0\u01b2\0\u0e88\0\u0ec6\0\u0f04\0\u0f42\0\u0f80\0\u0fbe\0\370"+
-    "\0\u0ffc\0\u103a\0\370\0\u1078\0\u10b6\0\u10f4\0\u1132\0\u1170"+
-    "\0\u11ae\0\u11ec\0\u122a\0\u1268\0\u12a6\0\u12e4\0\370\0\u1322"+
-    "\0\u1360\0\u139e\0\370\0\u13dc\0\u141a\0\370\0\u1458\0\u1496"+
-    "\0\u14d4\0\u1512\0\u01b2\0\u01b2\0\u01b2\0\u1550\0\272\0\272"+
-    "\0\272\0\272\0\272\0\u158e\0\272\0\u15cc\0\u02e8\0\u160a"+
-    "\0\u1648\0\u1648\0\272\0\272\0\272\0\u1686\0\272\0\u16c4"+
-    "\0\u1702\0\272\0\u01b2\0\u1740\0\u177e\0\u17bc\0\u17fa\0\u1838"+
-    "\0\u1876\0\370\0\u18b4\0\u18f2\0\u1930\0\u196e\0\u19ac\0\u19ea"+
-    "\0\u1a28\0\u1a66\0\u1aa4\0\u1ae2\0\u1b20\0\u1b5e\0\370\0\u1b9c"+
-    "\0\u1bda\0\u1c18\0\u1c56\0\u1c94\0\u1cd2\0\u1d10\0\u1d4e\0\u1d8c"+
-    "\0\370\0\272\0\u1dca\0\272\0\u1e08\0\u1e46\0\u01b2\0\u1e84"+
-    "\0\u1ec2\0\u1f00\0\u1f3e\0\u1f7c\0\u1fba\0\u1ff8\0\u2036\0\u2074"+
-    "\0\370\0\370\0\u20b2\0\u20f0\0\370\0\u212e\0\u216c\0\u21aa"+
-    "\0\370\0\u21e8\0\370\0\u2226\0\u2264\0\370\0\u22a2\0\u22e0"+
-    "\0\u231e\0\u235c\0\272\0\u239a\0\u23d8\0\u2416\0\u2454\0\u2492"+
-    "\0\u24d0\0\u250e\0\u254c\0\u258a\0\u25c8\0\u2606\0\u2644\0\u2682"+
-    "\0\u26c0\0\370\0\u26fe\0\370\0\u273c\0\370\0\u277a\0\u27b8"+
-    "\0\272\0\370\0\u27f6\0\u2834\0\370\0\370\0\u2872\0\u28b0"+
-    "\0\u28ee\0\u292c\0\370\0\370\0\u296a\0\u29a8\0\u29e6\0\u2a24"+
-    "\0\u2a62\0\u2aa0\0\272\0\370\0\u2ade\0\u2b1c\0\370\0\u2b5a"+
-    "\0\u2b98\0\370\0\370\0\u2bd6\0\u2c14\0\u2c52\0\u2c90\0\u2cce"+
-    "\0\370\0\u2d0c\0\u2d4a\0\u2d88\0\u2dc6\0\u2e04\0\370\0\u2e42"+
-    "\0\u2e80\0\u2ebe\0\u2efc\0\u2f3a\0\u2f78\0\u2fb6\0\u2ff4\0\u3032"+
-    "\0\370\0\u3070\0\u30ae\0\u30ec\0\370\0\u312a\0\u3168\0\u31a6"+
-    "\0\u31e4\0\u3222\0\u3260\0\u329e\0\u32dc\0\272\0\u331a\0\u3358"+
-    "\0\272\0\u3396\0\u33d4\0\u3412\0\370\0\u3450\0\u348e\0\272"+
-    "\0\u34cc\0\272";
+    "\0\u0326\0\u0364\0\u03a2\0\u03e0\0\u041e\0\u045c\0\u049a\0\272"+
+    "\0\u04d8\0\u0516\0\u0554\0\u0592\0\u05d0\0\u060e\0\u064c\0\u068a"+
+    "\0\u06c8\0\u0706\0\u0744\0\u0782\0\u07c0\0\u07fe\0\u083c\0\272"+
+    "\0\272\0\272\0\272\0\u087a\0\u08b8\0\272\0\u01b2\0\u08f6"+
+    "\0\370\0\272\0\272\0\u0934\0\u0972\0\u09b0\0\272\0\272"+
+    "\0\u09ee\0\u0a2c\0\u0a6a\0\u0934\0\272\0\u0aa8\0\u0ae6\0\u0b24"+
+    "\0\u0b62\0\u0ba0\0\u0bde\0\272\0\u0c1c\0\u0c5a\0\u0c98\0\u0cd6"+
+    "\0\u0d14\0\u0d52\0\u0d90\0\u0dce\0\u0e0c\0\u0e4a\0\u01b2\0\u0e88"+
+    "\0\u01b2\0\u01b2\0\u01b2\0\u0ec6\0\u0f04\0\u0f42\0\u0f80\0\u0fbe"+
+    "\0\u0ffc\0\370\0\u103a\0\u1078\0\370\0\u10b6\0\u10f4\0\u1132"+
+    "\0\u1170\0\u11ae\0\u11ec\0\u122a\0\u1268\0\u12a6\0\u12e4\0\u1322"+
+    "\0\370\0\u1360\0\u139e\0\u13dc\0\370\0\u141a\0\u1458\0\370"+
+    "\0\u1496\0\u14d4\0\u1512\0\u1550\0\u01b2\0\u01b2\0\u01b2\0\u158e"+
+    "\0\272\0\272\0\272\0\272\0\272\0\u15cc\0\272\0\u160a"+
+    "\0\u02e8\0\u1648\0\u1686\0\u1686\0\272\0\272\0\272\0\u16c4"+
+    "\0\272\0\u1702\0\u1740\0\272\0\u01b2\0\u177e\0\u17bc\0\u17fa"+
+    "\0\u1838\0\u1876\0\u18b4\0\370\0\u18f2\0\u1930\0\u196e\0\u19ac"+
+    "\0\u19ea\0\u1a28\0\u1a66\0\u1aa4\0\u1ae2\0\u1b20\0\u1b5e\0\u1b9c"+
+    "\0\370\0\u1bda\0\u1c18\0\u1c56\0\u1c94\0\u1cd2\0\u1d10\0\u1d4e"+
+    "\0\u1d8c\0\u1dca\0\370\0\272\0\u1e08\0\272\0\u1e46\0\u1e84"+
+    "\0\u01b2\0\u1ec2\0\u1f00\0\u1f3e\0\u1f7c\0\u1fba\0\u1ff8\0\u2036"+
+    "\0\u2074\0\u20b2\0\370\0\370\0\u20f0\0\u212e\0\370\0\u216c"+
+    "\0\u21aa\0\u21e8\0\370\0\u2226\0\370\0\u2264\0\u22a2\0\370"+
+    "\0\u22e0\0\u231e\0\u235c\0\u239a\0\272\0\u23d8\0\u2416\0\u2454"+
+    "\0\u2492\0\u24d0\0\u250e\0\u254c\0\u258a\0\u25c8\0\u2606\0\u2644"+
+    "\0\u2682\0\u26c0\0\u26fe\0\370\0\u273c\0\370\0\u277a\0\370"+
+    "\0\u27b8\0\u27f6\0\272\0\370\0\u2834\0\u2872\0\370\0\370"+
+    "\0\u28b0\0\u28ee\0\u292c\0\u296a\0\370\0\370\0\u29a8\0\u29e6"+
+    "\0\u2a24\0\u2a62\0\u2aa0\0\u2ade\0\272\0\370\0\u2b1c\0\u2b5a"+
+    "\0\370\0\u2b98\0\u2bd6\0\370\0\370\0\u2c14\0\u2c52\0\u2c90"+
+    "\0\u2cce\0\u2d0c\0\370\0\u2d4a\0\u2d88\0\u2dc6\0\u2e04\0\u2e42"+
+    "\0\370\0\u2e80\0\u2ebe\0\u2efc\0\u2f3a\0\u2f78\0\u2fb6\0\u2ff4"+
+    "\0\u3032\0\u3070\0\370\0\u30ae\0\u30ec\0\u312a\0\370\0\u3168"+
+    "\0\u31a6\0\u31e4\0\u3222\0\u3260\0\u329e\0\u32dc\0\u331a\0\272"+
+    "\0\u3358\0\u3396\0\272\0\u33d4\0\u3412\0\u3450\0\370\0\u348e"+
+    "\0\u34cc\0\272\0\u350a\0\272";

 
   private static int [] zzUnpackRowMap() {
 
   private static int [] zzUnpackRowMap() {

-    int [] result = new int[298];
+    int [] result = new int[300];

     int offset = 0;
     offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
     return result;
     int offset = 0;
     offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
     return result;


@@ -202,264 +202,266 @@ public class SCLLexer {
     "\6\0\30\112\11\0\1\112\77\0\1\62\2\0\1\113"+
     "\1\0\1\113\5\0\1\114\2\0\1\115\5\0\1\113"+
     "\6\0\30\113\11\0\1\113\10\0\2\11\1\0\1\11"+
     "\6\0\30\112\11\0\1\112\77\0\1\62\2\0\1\113"+
     "\1\0\1\113\5\0\1\114\2\0\1\115\5\0\1\113"+
     "\6\0\30\113\11\0\1\113\10\0\2\11\1\0\1\11"+

-    "\3\0\1\116\2\0\1\11\1\117\1\11\1\0\1\120"+
-    "\1\0\2\11\1\0\1\11\34\0\2\11\1\0\1\117"+
-    "\12\0\2\11\1\0\1\11\6\0\2\11\1\121\1\0"+
+    "\3\0\1\116\2\0\1\117\1\120\1\11\1\0\1\121"+
+    "\1\0\2\11\1\0\1\11\34\0\2\11\1\0\1\120"+
+    "\12\0\2\11\1\0\1\11\6\0\2\11\1\122\1\0"+

     "\1\11\1\0\2\11\1\0\1\11\34\0\2\11\1\0"+
     "\1\11\1\0\2\11\1\0\1\11\34\0\2\11\1\0"+

-    "\1\11\31\0\1\26\56\0\2\11\1\0\1\11\6\0"+
-    "\3\11\1\0\1\11\1\0\1\122\1\123\1\0\1\11"+
-    "\34\0\2\11\1\0\1\11\12\0\2\11\1\0\1\11"+
-    "\6\0\3\11\1\0\1\11\1\124\2\11\1\0\1\11"+
-    "\21\0\1\125\12\0\2\11\1\0\1\11\6\0\4\6"+
-    "\2\0\1\76\12\0\1\6\6\0\1\6\1\126\26\6"+
-    "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+
-    "\6\0\14\6\1\127\13\6\11\0\1\6\4\0\4\6"+
-    "\2\0\1\76\12\0\1\6\6\0\12\6\1\130\2\6"+
-    "\1\131\12\6\11\0\1\6\4\0\4\6\2\0\1\76"+
-    "\12\0\1\6\6\0\10\6\1\132\17\6\11\0\1\6"+
-    "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\1\133"+
-    "\10\6\1\134\7\6\1\135\6\6\11\0\1\6\4\0"+
-    "\4\6\2\0\1\76\12\0\1\6\6\0\2\6\1\136"+
-    "\4\6\1\137\16\6\1\140\1\6\11\0\1\6\4\0"+
-    "\4\6\2\0\1\76\12\0\1\6\6\0\5\6\1\141"+
-    "\22\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
-    "\1\6\6\0\1\142\3\6\1\143\4\6\1\144\5\6"+
-    "\1\145\1\146\3\6\1\147\3\6\11\0\1\6\4\0"+
-    "\4\6\2\0\1\76\12\0\1\6\6\0\10\6\1\150"+
-    "\17\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
-    "\1\6\6\0\5\6\1\151\1\6\1\152\20\6\11\0"+
-    "\1\6\4\0\4\6\2\0\1\76\12\0\1\6\6\0"+
-    "\26\6\1\153\1\6\11\0\1\6\4\0\4\6\2\0"+
-    "\1\76\12\0\1\6\6\0\1\6\1\154\2\6\1\155"+
-    "\23\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
-    "\1\6\6\0\1\6\1\156\1\6\1\157\4\6\1\160"+
-    "\17\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
-    "\1\6\6\0\3\6\1\161\14\6\1\162\7\6\11\0"+
-    "\1\6\10\0\2\11\1\0\1\11\6\0\2\11\1\163"+
+    "\1\11\12\0\2\11\1\0\1\11\6\0\2\11\1\123"+

     "\1\0\1\11\1\0\2\11\1\0\1\11\34\0\2\11"+
     "\1\0\1\11\1\0\2\11\1\0\1\11\34\0\2\11"+

-    "\1\0\1\11\12\0\2\11\1\0\1\11\6\0\3\11"+
-    "\1\0\1\164\1\0\2\11\1\0\1\11\34\0\1\11"+
-    "\1\165\1\0\1\11\76\0\1\166\4\0\15\64\1\0"+
-    "\11\64\2\0\40\64\1\0\2\64\1\0\1\64\74\0"+
-    "\1\70\1\0\4\167\1\170\4\167\1\171\3\167\1\0"+
-    "\12\167\1\170\2\167\1\172\3\167\1\173\2\167\1\75"+
-    "\2\167\1\174\23\167\1\170\1\167\2\0\1\167\74\0"+
-    "\1\75\12\0\1\175\155\0\1\176\5\0\1\6\1\0"+
-    "\1\6\10\0\1\177\5\0\1\6\6\0\30\6\11\0"+
-    "\1\6\5\0\1\200\75\0\1\201\20\0\1\202\56\0"+
-    "\1\203\71\0\27\101\1\0\46\101\15\0\1\103\6\0"+
-    "\1\103\47\0\1\103\16\0\1\105\6\0\1\105\47\0"+
-    "\1\105\2\0\4\106\15\0\1\106\6\0\30\106\11\0"+
-    "\1\106\10\0\2\107\1\0\1\107\2\0\1\204\3\0"+
-    "\3\107\1\0\1\107\1\0\2\107\1\0\1\107\34\0"+
-    "\2\107\1\0\1\107\20\0\1\204\74\0\1\111\1\205"+
-    "\63\0\4\112\15\0\1\112\6\0\30\112\11\0\1\112"+
-    "\4\0\4\113\2\0\1\206\6\0\1\207\3\0\1\113"+
-    "\6\0\30\113\11\0\1\113\15\0\1\210\64\0\1\211"+
-    "\1\0\1\211\16\0\1\211\6\0\30\211\11\0\1\211"+
-    "\24\0\1\212\61\0\2\11\1\0\1\11\6\0\2\11"+
-    "\1\213\1\0\1\11\1\0\2\11\1\0\1\11\34\0"+
-    "\2\11\1\0\1\11\5\0\15\122\1\0\56\122\1\0"+
-    "\1\122\5\214\2\123\1\214\1\123\6\214\3\123\1\214"+
-    "\1\123\1\214\1\123\1\215\1\214\1\123\34\214\2\123"+
-    "\1\214\1\123\5\214\24\0\1\124\25\0\1\125\57\0"+
-    "\1\216\42\0\4\6\2\0\1\76\12\0\1\6\6\0"+
-    "\2\6\1\217\25\6\11\0\1\6\4\0\4\6\2\0"+
-    "\1\76\12\0\1\6\6\0\4\6\1\220\23\6\11\0"+
-    "\1\6\4\0\4\6\2\0\1\76\12\0\1\6\6\0"+
-    "\12\6\1\221\15\6\11\0\1\6\4\0\4\6\2\0"+
-    "\1\76\12\0\1\6\6\0\6\6\1\222\21\6\11\0"+
+    "\1\0\1\11\31\0\1\26\56\0\2\11\1\0\1\11"+
+    "\6\0\3\11\1\0\1\11\1\0\1\124\1\125\1\0"+
+    "\1\11\34\0\2\11\1\0\1\11\12\0\2\11\1\0"+
+    "\1\11\6\0\3\11\1\0\1\11\1\126\2\11\1\0"+
+    "\1\11\21\0\1\127\12\0\2\11\1\0\1\11\6\0"+
+    "\4\6\2\0\1\76\12\0\1\6\6\0\1\6\1\130"+
+    "\26\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
+    "\1\6\6\0\14\6\1\131\13\6\11\0\1\6\4\0"+
+    "\4\6\2\0\1\76\12\0\1\6\6\0\12\6\1\132"+
+    "\2\6\1\133\12\6\11\0\1\6\4\0\4\6\2\0"+
+    "\1\76\12\0\1\6\6\0\10\6\1\134\17\6\11\0"+

     "\1\6\4\0\4\6\2\0\1\76\12\0\1\6\6\0"+
     "\1\6\4\0\4\6\2\0\1\76\12\0\1\6\6\0"+

-    "\1\223\11\6\1\224\3\6\1\225\11\6\11\0\1\6"+
-    "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\22\6"+
-    "\1\226\5\6\11\0\1\6\4\0\4\6\2\0\1\76"+
-    "\12\0\1\6\6\0\3\6\1\227\24\6\11\0\1\6"+
+    "\1\135\10\6\1\136\7\6\1\137\6\6\11\0\1\6"+
+    "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\2\6"+
+    "\1\140\4\6\1\141\16\6\1\142\1\6\11\0\1\6"+
+    "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\5\6"+
+    "\1\143\22\6\11\0\1\6\4\0\4\6\2\0\1\76"+
+    "\12\0\1\6\6\0\1\144\3\6\1\145\4\6\1\146"+
+    "\5\6\1\147\1\150\3\6\1\151\3\6\11\0\1\6"+

     "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\10\6"+
     "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\10\6"+

-    "\1\230\17\6\11\0\1\6\4\0\4\6\2\0\1\76"+
-    "\12\0\1\6\6\0\22\6\1\231\5\6\11\0\1\6"+
-    "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\20\6"+
-    "\1\232\7\6\11\0\1\6\4\0\4\6\2\0\1\76"+
-    "\12\0\1\6\6\0\1\233\27\6\11\0\1\6\4\0"+
-    "\4\6\2\0\1\76\12\0\1\6\6\0\12\6\1\234"+
-    "\15\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
-    "\1\6\6\0\1\235\27\6\11\0\1\6\4\0\4\6"+
-    "\2\0\1\76\12\0\1\6\6\0\6\6\1\236\21\6"+
-    "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+
-    "\6\0\1\6\1\237\26\6\11\0\1\6\4\0\4\6"+
-    "\2\0\1\76\12\0\1\6\6\0\4\6\1\240\23\6"+
-    "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+
-    "\6\0\6\6\1\241\21\6\11\0\1\6\4\0\4\6"+
-    "\2\0\1\76\12\0\1\6\6\0\10\6\1\242\17\6"+
-    "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+
-    "\6\0\11\6\1\243\16\6\11\0\1\6\4\0\4\6"+
-    "\2\0\1\76\12\0\1\6\6\0\3\6\1\244\24\6"+
+    "\1\152\17\6\11\0\1\6\4\0\4\6\2\0\1\76"+
+    "\12\0\1\6\6\0\5\6\1\153\1\6\1\154\20\6"+

     "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+
     "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+

-    "\6\0\6\6\1\245\21\6\11\0\1\6\4\0\4\6"+
-    "\2\0\1\76\12\0\1\6\6\0\2\6\1\246\25\6"+
+    "\6\0\26\6\1\155\1\6\11\0\1\6\4\0\4\6"+
+    "\2\0\1\76\12\0\1\6\6\0\1\6\1\156\2\6"+
+    "\1\157\23\6\11\0\1\6\4\0\4\6\2\0\1\76"+
+    "\12\0\1\6\6\0\1\6\1\160\1\6\1\161\4\6"+
+    "\1\162\17\6\11\0\1\6\4\0\4\6\2\0\1\76"+
+    "\12\0\1\6\6\0\3\6\1\163\14\6\1\164\7\6"+
+    "\11\0\1\6\10\0\2\11\1\0\1\11\6\0\2\11"+
+    "\1\165\1\0\1\11\1\0\2\11\1\0\1\11\34\0"+
+    "\2\11\1\0\1\11\12\0\2\11\1\0\1\11\6\0"+
+    "\3\11\1\0\1\166\1\0\2\11\1\0\1\11\34\0"+
+    "\1\11\1\167\1\0\1\11\76\0\1\170\4\0\15\64"+
+    "\1\0\11\64\2\0\40\64\1\0\2\64\1\0\1\64"+
+    "\74\0\1\70\1\0\4\171\1\172\4\171\1\173\3\171"+
+    "\1\0\12\171\1\172\2\171\1\174\3\171\1\175\2\171"+
+    "\1\75\2\171\1\176\23\171\1\172\1\171\2\0\1\171"+
+    "\74\0\1\75\12\0\1\177\155\0\1\200\5\0\1\6"+
+    "\1\0\1\6\10\0\1\201\5\0\1\6\6\0\30\6"+
+    "\11\0\1\6\5\0\1\202\75\0\1\203\20\0\1\204"+
+    "\56\0\1\205\71\0\27\101\1\0\46\101\15\0\1\103"+
+    "\6\0\1\103\47\0\1\103\16\0\1\105\6\0\1\105"+
+    "\47\0\1\105\2\0\4\106\15\0\1\106\6\0\30\106"+
+    "\11\0\1\106\10\0\2\107\1\0\1\107\2\0\1\206"+
+    "\3\0\3\107\1\0\1\107\1\0\2\107\1\0\1\107"+
+    "\34\0\2\107\1\0\1\107\20\0\1\206\74\0\1\111"+
+    "\1\207\63\0\4\112\15\0\1\112\6\0\30\112\11\0"+
+    "\1\112\4\0\4\113\2\0\1\210\6\0\1\211\3\0"+
+    "\1\113\6\0\30\113\11\0\1\113\15\0\1\212\64\0"+
+    "\1\213\1\0\1\213\16\0\1\213\6\0\30\213\11\0"+
+    "\1\213\24\0\1\214\61\0\2\11\1\0\1\11\6\0"+
+    "\2\11\1\215\1\0\1\11\1\0\2\11\1\0\1\11"+
+    "\34\0\2\11\1\0\1\11\5\0\15\124\1\0\56\124"+
+    "\1\0\1\124\5\216\2\125\1\216\1\125\6\216\3\125"+
+    "\1\216\1\125\1\216\1\125\1\217\1\216\1\125\34\216"+
+    "\2\125\1\216\1\125\5\216\24\0\1\126\25\0\1\127"+
+    "\57\0\1\220\42\0\4\6\2\0\1\76\12\0\1\6"+
+    "\6\0\2\6\1\221\25\6\11\0\1\6\4\0\4\6"+
+    "\2\0\1\76\12\0\1\6\6\0\4\6\1\222\23\6"+

     "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+
     "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+

-    "\6\0\6\6\1\247\13\6\1\250\5\6\11\0\1\6"+
-    "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\1\6"+
-    "\1\251\26\6\11\0\1\6\74\0\1\252\6\0\2\253"+
-    "\16\0\1\253\6\0\1\253\2\0\1\253\4\0\1\253"+
-    "\4\0\2\253\1\0\1\253\115\0\1\254\6\0\1\200"+
-    "\17\0\1\100\16\0\1\100\36\0\1\201\74\0\1\113"+
-    "\1\0\1\113\10\0\1\115\5\0\1\113\6\0\30\113"+
-    "\11\0\1\113\15\0\1\210\1\255\63\0\4\211\11\0"+
-    "\1\207\3\0\1\211\6\0\30\211\11\0\1\211\3\0"+
-    "\26\214\1\256\54\214\2\123\1\214\1\123\6\214\3\123"+
-    "\1\214\1\123\1\214\1\257\1\215\1\214\1\123\34\214"+
-    "\2\123\1\214\1\123\5\214\37\0\1\260\37\0\4\6"+
-    "\2\0\1\76\12\0\1\6\6\0\3\6\1\261\24\6"+
+    "\6\0\12\6\1\223\15\6\11\0\1\6\4\0\4\6"+
+    "\2\0\1\76\12\0\1\6\6\0\6\6\1\224\21\6"+

     "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+
     "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+

-    "\6\0\10\6\1\262\17\6\11\0\1\6\4\0\4\6"+
-    "\2\0\1\76\12\0\1\6\6\0\6\6\1\263\21\6"+
-    "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+
-    "\6\0\5\6\1\264\22\6\11\0\1\6\4\0\4\6"+
-    "\2\0\1\76\12\0\1\6\6\0\6\6\1\265\21\6"+
-    "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+
-    "\6\0\4\6\1\266\23\6\11\0\1\6\4\0\4\6"+
-    "\2\0\1\76\12\0\1\6\6\0\1\6\1\267\26\6"+
-    "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+
-    "\6\0\11\6\1\270\16\6\11\0\1\6\4\0\4\6"+
-    "\2\0\1\76\12\0\1\6\6\0\11\6\1\271\16\6"+
-    "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+
-    "\6\0\10\6\1\272\17\6\11\0\1\6\4\0\4\6"+
-    "\2\0\1\76\12\0\1\6\6\0\5\6\1\273\22\6"+
-    "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+
-    "\6\0\10\6\1\274\17\6\11\0\1\6\4\0\4\6"+
-    "\2\0\1\76\12\0\1\6\6\0\10\6\1\275\17\6"+
-    "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+
-    "\6\0\1\6\1\276\26\6\11\0\1\6\4\0\4\6"+
-    "\2\0\1\76\12\0\1\6\6\0\10\6\1\277\17\6"+
-    "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+
-    "\6\0\10\6\1\300\17\6\11\0\1\6\4\0\4\6"+
-    "\2\0\1\76\12\0\1\6\6\0\7\6\1\301\20\6"+
-    "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+
-    "\6\0\2\6\1\302\6\6\1\303\16\6\11\0\1\6"+
+    "\6\0\1\225\11\6\1\226\3\6\1\227\11\6\11\0"+
+    "\1\6\4\0\4\6\2\0\1\76\12\0\1\6\6\0"+
+    "\22\6\1\230\5\6\11\0\1\6\4\0\4\6\2\0"+
+    "\1\76\12\0\1\6\6\0\3\6\1\231\24\6\11\0"+
+    "\1\6\4\0\4\6\2\0\1\76\12\0\1\6\6\0"+
+    "\10\6\1\232\17\6\11\0\1\6\4\0\4\6\2\0"+
+    "\1\76\12\0\1\6\6\0\22\6\1\233\5\6\11\0"+
+    "\1\6\4\0\4\6\2\0\1\76\12\0\1\6\6\0"+
+    "\20\6\1\234\7\6\11\0\1\6\4\0\4\6\2\0"+
+    "\1\76\12\0\1\6\6\0\1\235\27\6\11\0\1\6"+

     "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\12\6"+
     "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\12\6"+

-    "\1\304\15\6\11\0\1\6\4\0\4\6\2\0\1\76"+
-    "\12\0\1\6\6\0\12\6\1\305\15\6\11\0\1\6"+
-    "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\3\6"+
-    "\1\306\24\6\11\0\1\6\4\0\4\6\2\0\1\76"+
-    "\12\0\1\6\6\0\5\6\1\307\22\6\11\0\1\6"+
-    "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\16\6"+
-    "\1\310\11\6\11\0\1\6\4\0\4\6\2\0\1\76"+
-    "\12\0\1\6\6\0\22\6\1\311\5\6\11\0\1\6"+
-    "\5\0\2\312\16\0\1\312\6\0\1\312\2\0\1\312"+
-    "\4\0\1\312\4\0\2\312\1\0\1\312\42\0\1\207"+
-    "\57\0\25\214\1\313\1\256\47\214\47\0\1\314\27\0"+
-    "\4\6\2\0\1\76\12\0\1\6\6\0\4\6\1\315"+
+    "\1\236\15\6\11\0\1\6\4\0\4\6\2\0\1\76"+
+    "\12\0\1\6\6\0\1\237\27\6\11\0\1\6\4\0"+
+    "\4\6\2\0\1\76\12\0\1\6\6\0\6\6\1\240"+
+    "\21\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
+    "\1\6\6\0\1\6\1\241\26\6\11\0\1\6\4\0"+
+    "\4\6\2\0\1\76\12\0\1\6\6\0\4\6\1\242"+

     "\23\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
     "\23\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+

-    "\1\6\6\0\12\6\1\316\15\6\11\0\1\6\4\0"+
-    "\4\6\2\0\1\76\12\0\1\6\6\0\2\6\1\317"+
-    "\25\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
-    "\1\6\6\0\17\6\1\320\10\6\11\0\1\6\4\0"+
-    "\4\6\2\0\1\76\12\0\1\6\6\0\3\6\1\321"+
+    "\1\6\6\0\6\6\1\243\21\6\11\0\1\6\4\0"+
+    "\4\6\2\0\1\76\12\0\1\6\6\0\10\6\1\244"+
+    "\17\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
+    "\1\6\6\0\11\6\1\245\16\6\11\0\1\6\4\0"+
+    "\4\6\2\0\1\76\12\0\1\6\6\0\3\6\1\246"+

     "\24\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
     "\24\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+

-    "\1\6\6\0\14\6\1\322\13\6\11\0\1\6\4\0"+
-    "\4\6\2\0\1\76\12\0\1\6\6\0\2\6\1\323"+
-    "\25\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
-    "\1\6\6\0\12\6\1\324\15\6\11\0\1\6\4\0"+
-    "\4\6\2\0\1\76\12\0\1\6\6\0\11\6\1\325"+
-    "\16\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
-    "\1\6\6\0\16\6\1\326\11\6\11\0\1\6\4\0"+
-    "\4\6\2\0\1\76\12\0\1\6\6\0\2\6\1\327"+
+    "\1\6\6\0\6\6\1\247\21\6\11\0\1\6\4\0"+
+    "\4\6\2\0\1\76\12\0\1\6\6\0\2\6\1\250"+

     "\25\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
     "\25\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+

-    "\1\6\6\0\11\6\1\330\16\6\11\0\1\6\4\0"+
-    "\4\6\2\0\1\76\12\0\1\6\6\0\16\6\1\331"+
-    "\11\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
-    "\1\6\6\0\10\6\1\332\17\6\11\0\1\6\4\0"+
-    "\4\6\2\0\1\76\12\0\1\6\6\0\6\6\1\333"+
+    "\1\6\6\0\6\6\1\251\13\6\1\252\5\6\11\0"+
+    "\1\6\4\0\4\6\2\0\1\76\12\0\1\6\6\0"+
+    "\1\6\1\253\26\6\11\0\1\6\74\0\1\254\6\0"+
+    "\2\255\16\0\1\255\6\0\1\255\2\0\1\255\4\0"+
+    "\1\255\4\0\2\255\1\0\1\255\115\0\1\256\6\0"+
+    "\1\202\17\0\1\100\16\0\1\100\36\0\1\203\74\0"+
+    "\1\113\1\0\1\113\10\0\1\115\5\0\1\113\6\0"+
+    "\30\113\11\0\1\113\15\0\1\212\1\257\63\0\4\213"+
+    "\11\0\1\211\3\0\1\213\6\0\30\213\11\0\1\213"+
+    "\3\0\26\216\1\260\54\216\2\125\1\216\1\125\6\216"+
+    "\3\125\1\216\1\125\1\216\1\261\1\217\1\216\1\125"+
+    "\34\216\2\125\1\216\1\125\5\216\37\0\1\262\37\0"+
+    "\4\6\2\0\1\76\12\0\1\6\6\0\3\6\1\263"+
+    "\24\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
+    "\1\6\6\0\10\6\1\264\17\6\11\0\1\6\4\0"+
+    "\4\6\2\0\1\76\12\0\1\6\6\0\6\6\1\265"+
+    "\21\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
+    "\1\6\6\0\5\6\1\266\22\6\11\0\1\6\4\0"+
+    "\4\6\2\0\1\76\12\0\1\6\6\0\6\6\1\267"+

     "\21\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
     "\21\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+

-    "\1\6\6\0\12\6\1\334\15\6\11\0\1\6\4\0"+
-    "\4\6\2\0\1\76\12\0\1\6\6\0\25\6\1\335"+
-    "\2\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
-    "\1\6\6\0\7\6\1\336\20\6\11\0\1\6\4\0"+
-    "\4\6\2\0\1\76\12\0\1\6\6\0\5\6\1\337"+
-    "\22\6\11\0\1\6\5\0\2\340\16\0\1\340\6\0"+
-    "\1\340\2\0\1\340\4\0\1\340\4\0\2\340\1\0"+
-    "\1\340\64\0\1\341\36\0\4\6\2\0\1\76\12\0"+
-    "\1\6\6\0\4\6\1\342\23\6\11\0\1\6\4\0"+
-    "\4\6\2\0\1\76\12\0\1\6\6\0\10\6\1\343"+
+    "\1\6\6\0\4\6\1\270\23\6\11\0\1\6\4\0"+
+    "\4\6\2\0\1\76\12\0\1\6\6\0\1\6\1\271"+
+    "\26\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
+    "\1\6\6\0\11\6\1\272\16\6\11\0\1\6\4\0"+
+    "\4\6\2\0\1\76\12\0\1\6\6\0\11\6\1\273"+
+    "\16\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
+    "\1\6\6\0\10\6\1\274\17\6\11\0\1\6\4\0"+
+    "\4\6\2\0\1\76\12\0\1\6\6\0\5\6\1\275"+
+    "\22\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
+    "\1\6\6\0\10\6\1\276\17\6\11\0\1\6\4\0"+
+    "\4\6\2\0\1\76\12\0\1\6\6\0\10\6\1\277"+
+    "\17\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
+    "\1\6\6\0\1\6\1\300\26\6\11\0\1\6\4\0"+
+    "\4\6\2\0\1\76\12\0\1\6\6\0\10\6\1\301"+

     "\17\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
     "\17\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+

-    "\1\6\6\0\3\6\1\344\24\6\11\0\1\6\4\0"+
-    "\4\6\2\0\1\76\12\0\1\6\6\0\2\6\1\345"+
-    "\1\6\1\346\23\6\11\0\1\6\4\0\4\6\2\0"+
-    "\1\76\12\0\1\6\6\0\11\6\1\347\16\6\11\0"+
+    "\1\6\6\0\10\6\1\302\17\6\11\0\1\6\4\0"+
+    "\4\6\2\0\1\76\12\0\1\6\6\0\7\6\1\303"+
+    "\20\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
+    "\1\6\6\0\2\6\1\304\6\6\1\305\16\6\11\0"+

     "\1\6\4\0\4\6\2\0\1\76\12\0\1\6\6\0"+
     "\1\6\4\0\4\6\2\0\1\76\12\0\1\6\6\0"+

-    "\20\6\1\350\7\6\11\0\1\6\4\0\4\6\2\0"+
-    "\1\76\12\0\1\6\6\0\6\6\1\351\21\6\11\0"+
+    "\12\6\1\306\15\6\11\0\1\6\4\0\4\6\2\0"+
+    "\1\76\12\0\1\6\6\0\12\6\1\307\15\6\11\0"+

     "\1\6\4\0\4\6\2\0\1\76\12\0\1\6\6\0"+
     "\1\6\4\0\4\6\2\0\1\76\12\0\1\6\6\0"+

-    "\1\352\27\6\11\0\1\6\4\0\4\6\2\0\1\76"+
-    "\12\0\1\6\6\0\23\6\1\353\4\6\11\0\1\6"+
-    "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\6\6"+
-    "\1\354\21\6\11\0\1\6\4\0\4\6\2\0\1\76"+
-    "\12\0\1\6\6\0\16\6\1\355\11\6\11\0\1\6"+
-    "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\20\6"+
-    "\1\356\7\6\11\0\1\6\4\0\4\6\2\0\1\76"+
-    "\12\0\1\6\6\0\6\6\1\357\21\6\11\0\1\6"+
+    "\3\6\1\310\24\6\11\0\1\6\4\0\4\6\2\0"+
+    "\1\76\12\0\1\6\6\0\5\6\1\311\22\6\11\0"+
+    "\1\6\4\0\4\6\2\0\1\76\12\0\1\6\6\0"+
+    "\16\6\1\312\11\6\11\0\1\6\4\0\4\6\2\0"+
+    "\1\76\12\0\1\6\6\0\22\6\1\313\5\6\11\0"+
+    "\1\6\5\0\2\314\16\0\1\314\6\0\1\314\2\0"+
+    "\1\314\4\0\1\314\4\0\2\314\1\0\1\314\42\0"+
+    "\1\211\57\0\25\216\1\315\1\260\47\216\47\0\1\316"+
+    "\27\0\4\6\2\0\1\76\12\0\1\6\6\0\4\6"+
+    "\1\317\23\6\11\0\1\6\4\0\4\6\2\0\1\76"+
+    "\12\0\1\6\6\0\12\6\1\320\15\6\11\0\1\6"+
+    "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\2\6"+
+    "\1\321\25\6\11\0\1\6\4\0\4\6\2\0\1\76"+
+    "\12\0\1\6\6\0\17\6\1\322\10\6\11\0\1\6"+
+    "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\3\6"+
+    "\1\323\24\6\11\0\1\6\4\0\4\6\2\0\1\76"+
+    "\12\0\1\6\6\0\14\6\1\324\13\6\11\0\1\6"+

     "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\2\6"+
     "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\2\6"+

-    "\1\360\25\6\11\0\1\6\4\0\4\6\2\0\1\76"+
-    "\12\0\1\6\6\0\5\6\1\361\22\6\11\0\1\6"+
+    "\1\325\25\6\11\0\1\6\4\0\4\6\2\0\1\76"+
+    "\12\0\1\6\6\0\12\6\1\326\15\6\11\0\1\6"+

     "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\11\6"+
     "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\11\6"+

-    "\1\362\16\6\11\0\1\6\5\0\2\363\16\0\1\363"+
-    "\6\0\1\363\2\0\1\363\4\0\1\363\4\0\2\363"+
-    "\1\0\1\363\25\0\4\6\2\0\1\76\12\0\1\6"+
-    "\6\0\6\6\1\364\21\6\11\0\1\6\4\0\4\6"+
-    "\2\0\1\76\12\0\1\6\6\0\16\6\1\365\11\6"+
+    "\1\327\16\6\11\0\1\6\4\0\4\6\2\0\1\76"+
+    "\12\0\1\6\6\0\16\6\1\330\11\6\11\0\1\6"+
+    "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\2\6"+
+    "\1\331\25\6\11\0\1\6\4\0\4\6\2\0\1\76"+
+    "\12\0\1\6\6\0\11\6\1\332\16\6\11\0\1\6"+
+    "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\16\6"+
+    "\1\333\11\6\11\0\1\6\4\0\4\6\2\0\1\76"+
+    "\12\0\1\6\6\0\10\6\1\334\17\6\11\0\1\6"+
+    "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\6\6"+
+    "\1\335\21\6\11\0\1\6\4\0\4\6\2\0\1\76"+
+    "\12\0\1\6\6\0\12\6\1\336\15\6\11\0\1\6"+
+    "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\25\6"+
+    "\1\337\2\6\11\0\1\6\4\0\4\6\2\0\1\76"+
+    "\12\0\1\6\6\0\7\6\1\340\20\6\11\0\1\6"+
+    "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\5\6"+
+    "\1\341\22\6\11\0\1\6\5\0\2\342\16\0\1\342"+
+    "\6\0\1\342\2\0\1\342\4\0\1\342\4\0\2\342"+
+    "\1\0\1\342\64\0\1\343\36\0\4\6\2\0\1\76"+
+    "\12\0\1\6\6\0\4\6\1\344\23\6\11\0\1\6"+
+    "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\10\6"+
+    "\1\345\17\6\11\0\1\6\4\0\4\6\2\0\1\76"+
+    "\12\0\1\6\6\0\3\6\1\346\24\6\11\0\1\6"+
+    "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\2\6"+
+    "\1\347\1\6\1\350\23\6\11\0\1\6\4\0\4\6"+
+    "\2\0\1\76\12\0\1\6\6\0\11\6\1\351\16\6"+

     "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+
     "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+

-    "\6\0\16\6\1\366\11\6\11\0\1\6\4\0\4\6"+
-    "\2\0\1\76\12\0\1\6\6\0\10\6\1\367\17\6"+
+    "\6\0\20\6\1\352\7\6\11\0\1\6\4\0\4\6"+
+    "\2\0\1\76\12\0\1\6\6\0\6\6\1\353\21\6"+

     "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+
     "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+

-    "\6\0\27\6\1\370\11\0\1\6\4\0\4\6\2\0"+
-    "\1\76\12\0\1\6\6\0\1\6\1\371\26\6\11\0"+
+    "\6\0\1\354\27\6\11\0\1\6\4\0\4\6\2\0"+
+    "\1\76\12\0\1\6\6\0\23\6\1\355\4\6\11\0"+

     "\1\6\4\0\4\6\2\0\1\76\12\0\1\6\6\0"+
     "\1\6\4\0\4\6\2\0\1\76\12\0\1\6\6\0"+

-    "\10\6\1\372\17\6\11\0\1\6\4\0\4\6\2\0"+
-    "\1\76\12\0\1\6\6\0\12\6\1\373\15\6\11\0"+
-    "\1\6\4\0\4\6\2\0\1\76\12\0\1\6\1\0"+
-    "\1\374\4\0\30\6\11\0\1\6\4\0\4\6\2\0"+
-    "\1\76\12\0\1\6\6\0\3\6\1\375\24\6\11\0"+
+    "\6\6\1\356\21\6\11\0\1\6\4\0\4\6\2\0"+
+    "\1\76\12\0\1\6\6\0\16\6\1\357\11\6\11\0"+

     "\1\6\4\0\4\6\2\0\1\76\12\0\1\6\6\0"+
     "\1\6\4\0\4\6\2\0\1\76\12\0\1\6\6\0"+

-    "\11\6\1\376\16\6\11\0\1\6\4\0\4\6\2\0"+
-    "\1\76\12\0\1\6\6\0\23\6\1\377\4\6\11\0"+
+    "\20\6\1\360\7\6\11\0\1\6\4\0\4\6\2\0"+
+    "\1\76\12\0\1\6\6\0\6\6\1\361\21\6\11\0"+

     "\1\6\4\0\4\6\2\0\1\76\12\0\1\6\6\0"+
     "\1\6\4\0\4\6\2\0\1\76\12\0\1\6\6\0"+

-    "\6\6\1\u0100\21\6\11\0\1\6\4\0\4\6\2\0"+
-    "\1\76\12\0\1\6\6\0\10\6\1\u0101\17\6\11\0"+
+    "\2\6\1\362\25\6\11\0\1\6\4\0\4\6\2\0"+
+    "\1\76\12\0\1\6\6\0\5\6\1\363\22\6\11\0"+

     "\1\6\4\0\4\6\2\0\1\76\12\0\1\6\6\0"+
     "\1\6\4\0\4\6\2\0\1\76\12\0\1\6\6\0"+

-    "\3\6\1\u0102\24\6\11\0\1\6\4\0\4\6\2\0"+
-    "\1\76\12\0\1\6\6\0\2\6\1\u0103\25\6\11\0"+
-    "\1\6\27\0\1\374\4\0\1\u0104\17\0\1\u0105\25\0"+
-    "\4\6\2\0\1\76\12\0\1\6\6\0\5\6\1\u0106"+
-    "\22\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
-    "\1\6\6\0\23\6\1\u0107\4\6\11\0\1\6\4\0"+
-    "\4\6\2\0\1\76\12\0\1\6\1\0\1\u0108\4\0"+
-    "\30\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
-    "\1\6\1\0\1\u0109\4\0\30\6\11\0\1\6\4\0"+
-    "\4\6\2\0\1\76\12\0\1\6\6\0\25\6\1\u010a"+
-    "\2\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
-    "\1\6\6\0\21\6\1\u010b\6\6\11\0\1\6\41\0"+
-    "\1\u010c\75\0\1\u010d\40\0\4\6\2\0\1\76\12\0"+
-    "\1\6\6\0\11\6\1\u010e\16\6\11\0\1\6\27\0"+
-    "\1\u0108\6\0\1\u010f\66\0\1\u0109\6\0\1\u0110\43\0"+
-    "\4\6\2\0\1\76\12\0\1\6\6\0\3\6\1\u0111"+
-    "\24\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
-    "\1\6\6\0\3\6\1\u0112\24\6\11\0\1\6\36\0"+
-    "\1\u0113\105\0\1\u0114\33\0\4\6\2\0\1\76\12\0"+
-    "\1\6\6\0\6\6\1\u0115\21\6\11\0\1\6\44\0"+
-    "\1\u0116\101\0\1\u0117\31\0\4\6\2\0\1\76\12\0"+
-    "\1\6\6\0\6\6\1\u0118\21\6\11\0\1\6\46\0"+
-    "\1\u0119\71\0\1\u011a\73\0\1\u011b\75\0\1\u011c\41\0"+
-    "\4\6\2\0\1\76\12\0\1\6\6\0\5\6\1\u011d"+
-    "\22\6\11\0\1\6\42\0\1\u011e\74\0\1\u011f\73\0"+
-    "\1\u0120\102\0\1\u0121\35\0\4\6\2\0\1\76\12\0"+
-    "\1\6\6\0\1\6\1\u0122\26\6\11\0\1\6\45\0"+
-    "\1\u0123\72\0\1\u0124\37\0\4\6\2\0\1\76\12\0"+
-    "\1\6\6\0\11\6\1\u0125\16\6\11\0\1\6\52\0"+
-    "\1\u0126\64\0\1\u0127\76\0\1\u0128\70\0\1\u0129\105\0"+
-    "\1\u012a\33\0";
+    "\11\6\1\364\16\6\11\0\1\6\5\0\2\365\16\0"+
+    "\1\365\6\0\1\365\2\0\1\365\4\0\1\365\4\0"+
+    "\2\365\1\0\1\365\25\0\4\6\2\0\1\76\12\0"+
+    "\1\6\6\0\6\6\1\366\21\6\11\0\1\6\4\0"+
+    "\4\6\2\0\1\76\12\0\1\6\6\0\16\6\1\367"+
+    "\11\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
+    "\1\6\6\0\16\6\1\370\11\6\11\0\1\6\4\0"+
+    "\4\6\2\0\1\76\12\0\1\6\6\0\10\6\1\371"+
+    "\17\6\11\0\1\6\4\0\4\6\2\0\1\76\12\0"+
+    "\1\6\6\0\27\6\1\372\11\0\1\6\4\0\4\6"+
+    "\2\0\1\76\12\0\1\6\6\0\1\6\1\373\26\6"+
+    "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+
+    "\6\0\10\6\1\374\17\6\11\0\1\6\4\0\4\6"+
+    "\2\0\1\76\12\0\1\6\6\0\12\6\1\375\15\6"+
+    "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+
+    "\1\0\1\376\4\0\30\6\11\0\1\6\4\0\4\6"+
+    "\2\0\1\76\12\0\1\6\6\0\3\6\1\377\24\6"+
+    "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+
+    "\6\0\11\6\1\u0100\16\6\11\0\1\6\4\0\4\6"+
+    "\2\0\1\76\12\0\1\6\6\0\23\6\1\u0101\4\6"+
+    "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+
+    "\6\0\6\6\1\u0102\21\6\11\0\1\6\4\0\4\6"+
+    "\2\0\1\76\12\0\1\6\6\0\10\6\1\u0103\17\6"+
+    "\11\0\1\6\4\0\4\6\2\0\1\76\12\0\1\6"+
+    "\6\0\3\6\1\u0104\24\6\11\0\1\6\4\0\4\6"+
+    "\2\0\1\76\12\0\1\6\6\0\2\6\1\u0105\25\6"+
+    "\11\0\1\6\27\0\1\376\4\0\1\u0106\17\0\1\u0107"+
+    "\25\0\4\6\2\0\1\76\12\0\1\6\6\0\5\6"+
+    "\1\u0108\22\6\11\0\1\6\4\0\4\6\2\0\1\76"+
+    "\12\0\1\6\6\0\23\6\1\u0109\4\6\11\0\1\6"+
+    "\4\0\4\6\2\0\1\76\12\0\1\6\1\0\1\u010a"+
+    "\4\0\30\6\11\0\1\6\4\0\4\6\2\0\1\76"+
+    "\12\0\1\6\1\0\1\u010b\4\0\30\6\11\0\1\6"+
+    "\4\0\4\6\2\0\1\76\12\0\1\6\6\0\25\6"+
+    "\1\u010c\2\6\11\0\1\6\4\0\4\6\2\0\1\76"+
+    "\12\0\1\6\6\0\21\6\1\u010d\6\6\11\0\1\6"+
+    "\41\0\1\u010e\75\0\1\u010f\40\0\4\6\2\0\1\76"+
+    "\12\0\1\6\6\0\11\6\1\u0110\16\6\11\0\1\6"+
+    "\27\0\1\u010a\6\0\1\u0111\66\0\1\u010b\6\0\1\u0112"+
+    "\43\0\4\6\2\0\1\76\12\0\1\6\6\0\3\6"+
+    "\1\u0113\24\6\11\0\1\6\4\0\4\6\2\0\1\76"+
+    "\12\0\1\6\6\0\3\6\1\u0114\24\6\11\0\1\6"+
+    "\36\0\1\u0115\105\0\1\u0116\33\0\4\6\2\0\1\76"+
+    "\12\0\1\6\6\0\6\6\1\u0117\21\6\11\0\1\6"+
+    "\44\0\1\u0118\101\0\1\u0119\31\0\4\6\2\0\1\76"+
+    "\12\0\1\6\6\0\6\6\1\u011a\21\6\11\0\1\6"+
+    "\46\0\1\u011b\71\0\1\u011c\73\0\1\u011d\75\0\1\u011e"+
+    "\41\0\4\6\2\0\1\76\12\0\1\6\6\0\5\6"+
+    "\1\u011f\22\6\11\0\1\6\42\0\1\u0120\74\0\1\u0121"+
+    "\73\0\1\u0122\102\0\1\u0123\35\0\4\6\2\0\1\76"+
+    "\12\0\1\6\6\0\1\6\1\u0124\26\6\11\0\1\6"+
+    "\45\0\1\u0125\72\0\1\u0126\37\0\4\6\2\0\1\76"+
+    "\12\0\1\6\6\0\11\6\1\u0127\16\6\11\0\1\6"+
+    "\52\0\1\u0128\64\0\1\u0129\76\0\1\u012a\70\0\1\u012b"+
+    "\105\0\1\u012c\33\0";

 
   private static int [] zzUnpackTrans() {
 
   private static int [] zzUnpackTrans() {

-    int [] result = new int[13578];
+    int [] result = new int[13640];

     int offset = 0;
     offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
     return result;
     int offset = 0;
     offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
     return result;


@@ -500,7 +502,7 @@ public class SCLLexer {
     "\3\0\1\10\1\11\10\1\2\11\10\1\1\11\17\1"+
     "\4\11\2\1\1\11\3\1\2\11\2\1\1\0\2\11"+
     "\4\1\1\11\5\0\1\1\1\11\2\1\3\0\1\1"+
     "\3\0\1\10\1\11\10\1\2\11\10\1\1\11\17\1"+
     "\4\11\2\1\1\11\3\1\2\11\2\1\1\0\2\11"+
     "\4\1\1\11\5\0\1\1\1\11\2\1\3\0\1\1"+

-    "\4\0\5\1\2\0\40\1\1\0\5\11\1\1\1\11"+
+    "\4\0\7\1\2\0\40\1\1\0\5\11\1\1\1\11"+

     "\2\0\2\1\1\0\3\11\1\0\1\11\2\0\1\11"+
     "\1\1\1\0\1\1\1\0\33\1\1\11\1\0\1\11"+
     "\2\0\1\1\1\0\31\1\1\0\1\11\1\0\23\1"+
     "\2\0\2\1\1\0\3\11\1\0\1\11\2\0\1\11"+
     "\1\1\1\0\1\1\1\0\33\1\1\11\1\0\1\11"+
     "\2\0\1\1\1\0\31\1\1\0\1\11\1\0\23\1"+


@@ -510,7 +512,7 @@ public class SCLLexer {
     "\1\1\2\0\1\1\2\0\1\11\1\0\1\11";
 
   private static int [] zzUnpackAttribute() {
     "\1\1\2\0\1\1\2\0\1\11\1\0\1\11";
 
   private static int [] zzUnpackAttribute() {

-    int [] result = new int[298];
+    int [] result = new int[300];

     int offset = 0;
     offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
     return result;
     int offset = 0;
     offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
     return result;


@@ -928,11 +930,11 @@ public class SCLLexer {
             case STRING: {
               throw new SCLSyntaxErrorException(Locations.location(stringStart, yychar), "Unclosed string literal.");
             }
             case STRING: {
               throw new SCLSyntaxErrorException(Locations.location(stringStart, yychar), "Unclosed string literal.");
             }

-            case 299: break;
+            case 301: break;

             case LONG_STRING: {
               throw new SCLSyntaxErrorException(Locations.location(stringStart, yychar), "Unclosed string literal.");
             }
             case LONG_STRING: {
               throw new SCLSyntaxErrorException(Locations.location(stringStart, yychar), "Unclosed string literal.");
             }

-            case 300: break;
+            case 302: break;

             default:
           {     return sym(SCLTerminals.EOF);
  }
             default:
           {     return sym(SCLTerminals.EOF);
  }


@@ -943,39 +945,39 @@ public class SCLLexer {
           case 1: 
             { throw new SCLSyntaxErrorException(Locations.location(yychar, yychar+1), "Illegal character '" + yytext() + "'.");
             }
           case 1: 
             { throw new SCLSyntaxErrorException(Locations.location(yychar, yychar+1), "Illegal character '" + yytext() + "'.");
             }

-          case 97: break;
+          case 99: break;

           case 2: 
             { return sym(SCLTerminals.ID);
             }
           case 2: 
             { return sym(SCLTerminals.ID);
             }

-          case 98: break;
+          case 100: break;

           case 3: 
             { return sym(SCLTerminals.INTEGER);
             }
           case 3: 
             { return sym(SCLTerminals.INTEGER);
             }

-          case 99: break;
+          case 101: break;

           case 4: 
             { return sym(SCLTerminals.SYMBOL, yytext().trim());
             }
           case 4: 
             { return sym(SCLTerminals.SYMBOL, yytext().trim());
             }

-          case 100: break;
+          case 102: break;

           case 5: 
             { return sym(SCLTerminals.ATTACHED_HASH, "#");
             }
           case 5: 
             { return sym(SCLTerminals.ATTACHED_HASH, "#");
             }

-          case 101: break;
+          case 103: break;

           case 6: 
             { return sym(SCLTerminals.ATTACHED_DOT, ".");
             }
           case 6: 
             { return sym(SCLTerminals.ATTACHED_DOT, ".");
             }

-          case 102: break;
+          case 104: break;

           case 7: 
             { return sym(SCLTerminals.AT);
             }
           case 7: 
             { return sym(SCLTerminals.AT);
             }

-          case 103: break;
+          case 105: break;

           case 8: 
             { ++parenCount; return sym(SCLTerminals.LPAREN);
             }
           case 8: 
             { ++parenCount; return sym(SCLTerminals.LPAREN);
             }

-          case 104: break;
+          case 106: break;

           case 9: 
             { return sym(SCLTerminals.COMMA);
             }
           case 9: 
             { return sym(SCLTerminals.COMMA);
             }

-          case 105: break;
+          case 107: break;

           case 10: 
             { --parenCount;
                     if(parenCount == 0 && !parenCountStack.isEmpty()) { 
           case 10: 
             { --parenCount;
                     if(parenCount == 0 && !parenCountStack.isEmpty()) { 


@@ -988,363 +990,371 @@ public class SCLLexer {
                     else
                        return sym(SCLTerminals.RPAREN);
             }
                     else
                        return sym(SCLTerminals.RPAREN);
             }

-          case 106: break;
+          case 108: break;

           case 11: 
             { return new Token(SCLTerminals.EOL, yychar, yychar+yylength(), "");
             }
           case 11: 
             { return new Token(SCLTerminals.EOL, yychar, yychar+yylength(), "");
             }

-          case 107: break;
+          case 109: break;

           case 12: 
             { return sym(SCLTerminals.LESS, "<");
             }
           case 12: 
             { return sym(SCLTerminals.LESS, "<");
             }

-          case 108: break;
+          case 110: break;

           case 13: 
             { return sym(SCLTerminals.GREATER, ">");
             }
           case 13: 
             { return sym(SCLTerminals.GREATER, ">");
             }

-          case 109: break;
+          case 111: break;

           case 14: 
             { return sym(SCLTerminals.MINUS, "-");
             }
           case 14: 
             { return sym(SCLTerminals.MINUS, "-");
             }

-          case 110: break;
+          case 112: break;

           case 15: 
             { 
             }
           case 15: 
             { 
             }

-          case 111: break;
+          case 113: break;

           case 16: 
             { throw new SCLSyntaxErrorException(Locations.location(yychar, yychar+1), "Character does not conform to UTF-8 encoding.");
             }
           case 16: 
             { throw new SCLSyntaxErrorException(Locations.location(yychar, yychar+1), "Character does not conform to UTF-8 encoding.");
             }

-          case 112: break;
+          case 114: break;

           case 17: 
             { return sym(SCLTerminals.LAMBDA);
             }
           case 17: 
             { return sym(SCLTerminals.LAMBDA);
             }

-          case 113: break;
+          case 115: break;

           case 18: 
             { return sym(SCLTerminals.LBRACE);
             }
           case 18: 
             { return sym(SCLTerminals.LBRACE);
             }

-          case 114: break;
+          case 116: break;

           case 19: 
             { return sym(SCLTerminals.RBRACE);
             }
           case 19: 
             { return sym(SCLTerminals.RBRACE);
             }

-          case 115: break;
+          case 117: break;

           case 20: 
             { return sym(SCLTerminals.LBRACKET);
             }
           case 20: 
             { return sym(SCLTerminals.LBRACKET);
             }

-          case 116: break;
+          case 118: break;

           case 21: 
             { return sym(SCLTerminals.RBRACKET);
             }
           case 21: 
             { return sym(SCLTerminals.RBRACKET);
             }

-          case 117: break;
+          case 119: break;

           case 22: 
             { return sym(SCLTerminals.EQUALS);
             }
           case 22: 
             { return sym(SCLTerminals.EQUALS);
             }

-          case 118: break;
+          case 120: break;

           case 23: 
             { return sym(SCLTerminals.COLON);
             }
           case 23: 
             { return sym(SCLTerminals.COLON);
             }

-          case 119: break;
+          case 121: break;

           case 24: 
             { return sym(SCLTerminals.SEMICOLON);
             }
           case 24: 
             { return sym(SCLTerminals.SEMICOLON);
             }

-          case 120: break;
+          case 122: break;

           case 25: 
             { return sym(SCLTerminals.BAR);
             }
           case 25: 
             { return sym(SCLTerminals.BAR);
             }

-          case 121: break;
+          case 123: break;

           case 26: 
             { string.setLength(0); stringStart=yychar; yybegin(STRING); return sym(SCLTerminals.BEGIN_STRING);
             }
           case 26: 
             { string.setLength(0); stringStart=yychar; yybegin(STRING); return sym(SCLTerminals.BEGIN_STRING);
             }

-          case 122: break;
+          case 124: break;

           case 27: 
             { return sym(SCLTerminals.BLANK);
             }
           case 27: 
             { return sym(SCLTerminals.BLANK);
             }

-          case 123: break;
+          case 125: break;

           case 28: 
             { throw new SCLSyntaxErrorException(Locations.location(yychar, yychar+1), "Tabulator is not allowed except inside string literals.");
             }
           case 28: 
             { throw new SCLSyntaxErrorException(Locations.location(yychar, yychar+1), "Tabulator is not allowed except inside string literals.");
             }

-          case 124: break;
+          case 126: break;

           case 29: 
             { string.append( yytext() );
             }
           case 29: 
             { string.append( yytext() );
             }

-          case 125: break;
+          case 127: break;

           case 30: 
             { throw new SCLSyntaxErrorException(Locations.location(stringStart, yychar), "Unclosed string literal.");
             }
           case 30: 
             { throw new SCLSyntaxErrorException(Locations.location(stringStart, yychar), "Unclosed string literal.");
             }

-          case 126: break;
+          case 128: break;

           case 31: 
             { yybegin(YYINITIAL); 
                     return new Token(SCLTerminals.END_STRING, stringStart, yychar+1, string.toString());
             }
           case 31: 
             { yybegin(YYINITIAL); 
                     return new Token(SCLTerminals.END_STRING, stringStart, yychar+1, string.toString());
             }

-          case 127: break;
+          case 129: break;

           case 32: 
             { string.append('\n');
             }
           case 32: 
             { string.append('\n');
             }

-          case 128: break;
+          case 130: break;

           case 33: 
             { return sym(SCLTerminals.DOTDOT, ".");
             }
           case 33: 
             { return sym(SCLTerminals.DOTDOT, ".");
             }

-          case 129: break;
+          case 131: break;

           case 34: 
             { return sym(SCLTerminals.SEPARATED_DOT, ".");
             }
           case 34: 
             { return sym(SCLTerminals.SEPARATED_DOT, ".");
             }

-          case 130: break;
+          case 132: break;

           case 35: 
             { return sym(SCLTerminals.ANNOTATION_ID);
             }
           case 35: 
             { return sym(SCLTerminals.ANNOTATION_ID);
             }

-          case 131: break;
+          case 133: break;

           case 36: 
           case 36: 

-            { return sym(SCLTerminals.BINDS);
+            { return sym(SCLTerminals.DOUBLE_LESS, "<<");

             }
             }

-          case 132: break;
+          case 134: break;

           case 37: 
           case 37: 

-            { return sym(SCLTerminals.ARROW);
+            { return sym(SCLTerminals.BINDS);

             }
             }

-          case 133: break;
+          case 135: break;

           case 38: 
           case 38: 

-            { return sym(SCLTerminals.COMMENT);
+            { return sym(SCLTerminals.DOUBLE_GREATER, ">>");

             }
             }

-          case 134: break;
+          case 136: break;

           case 39: 
           case 39: 

-            { return sym(SCLTerminals.AS);
+            { return sym(SCLTerminals.ARROW);

             }
             }

-          case 135: break;
+          case 137: break;

           case 40: 
           case 40: 

-            { return sym(SCLTerminals.IF);
+            { return sym(SCLTerminals.COMMENT);

             }
             }

-          case 136: break;
+          case 138: break;

           case 41: 
           case 41: 

-            { return sym(SCLTerminals.IN);
+            { return sym(SCLTerminals.AS);

             }
             }

-          case 137: break;
+          case 139: break;

           case 42: 
           case 42: 

-            { return sym(options.supportEq ? SCLTerminals.EQ : SCLTerminals.ID);
+            { return sym(SCLTerminals.IF);

             }
             }

-          case 138: break;
+          case 140: break;

           case 43: 
           case 43: 

-            { return sym(SCLTerminals.BY);
+            { return sym(SCLTerminals.IN);

             }
             }

-          case 139: break;
+          case 141: break;

           case 44: 
           case 44: 

-            { return sym(SCLTerminals.DO);
+            { return sym(options.supportEq ? SCLTerminals.EQ : SCLTerminals.ID);

             }
             }

-          case 140: break;
+          case 142: break;

           case 45: 
           case 45: 

-            { return sym(SCLTerminals.IMPLIES);
+            { return sym(SCLTerminals.BY);

             }
             }

-          case 141: break;
+          case 143: break;

           case 46: 
           case 46: 

-            { return sym(SCLTerminals.FOLLOWS);
+            { return sym(SCLTerminals.DO);

             }
             }

-          case 142: break;
+          case 144: break;

           case 47: 
           case 47: 

-            { return sym(SCLTerminals.HASTYPE);
+            { return sym(SCLTerminals.IMPLIES);

             }
             }

-          case 143: break;
+          case 145: break;

           case 48: 
           case 48: 

-            { throw new SCLSyntaxErrorException(Locations.location(stringStart, yychar), "Illegal string escape character.");
+            { return sym(SCLTerminals.FOLLOWS);

             }
             }

-          case 144: break;
+          case 146: break;

           case 49: 
           case 49: 

-            { string.append(yytext().substring(1));
+            { return sym(SCLTerminals.HASTYPE);

             }
             }

-          case 145: break;
+          case 147: break;

           case 50: 
           case 50: 

+            { throw new SCLSyntaxErrorException(Locations.location(stringStart, yychar), "Illegal string escape character.");
+            }
+          case 148: break;
+          case 51: 
+            { string.append(yytext().substring(1));
+            }
+          case 149: break;
+          case 52: 

             { parenCountStack.add(parenCount);
                     parenCount = 1;
                     stateStack.add(STRING);
                     yybegin(YYINITIAL); 
                     return new Token(SCLTerminals.SUSPEND_STRING, stringStart, yychar+1, string.toString());
             }
             { parenCountStack.add(parenCount);
                     parenCount = 1;
                     stateStack.add(STRING);
                     yybegin(YYINITIAL); 
                     return new Token(SCLTerminals.SUSPEND_STRING, stringStart, yychar+1, string.toString());
             }

-          case 146: break;
-          case 51: 
+          case 150: break;
+          case 53: 

             { string.append('\r');
             }
             { string.append('\r');
             }

-          case 147: break;
-          case 52: 
+          case 151: break;
+          case 54: 

             { string.append('\t');
             }
             { string.append('\t');
             }

-          case 148: break;
-          case 53: 
+          case 152: break;
+          case 55: 

             { parenCountStack.add(parenCount);
                     parenCount = 1;
                     stateStack.add(LONG_STRING);
                     yybegin(YYINITIAL); 
                     return new Token(SCLTerminals.SUSPEND_STRING, stringStart, yychar+1, string.toString());
             }
             { parenCountStack.add(parenCount);
                     parenCount = 1;
                     stateStack.add(LONG_STRING);
                     yybegin(YYINITIAL); 
                     return new Token(SCLTerminals.SUSPEND_STRING, stringStart, yychar+1, string.toString());
             }

-          case 149: break;
-          case 54: 
+          case 153: break;
+          case 56: 

             { return sym(SCLTerminals.FLOAT);
             }
             { return sym(SCLTerminals.FLOAT);
             }

-          case 150: break;
-          case 55: 
+          case 154: break;
+          case 57: 

             { return sym(SCLTerminals.CHAR);
             }
             { return sym(SCLTerminals.CHAR);
             }

-          case 151: break;
-          case 56: 
+          case 155: break;
+          case 58: 

             { String text = yytext();
                      return sym(SCLTerminals.ID, text.substring(1, text.length()-1));
             }
             { String text = yytext();
                      return sym(SCLTerminals.ID, text.substring(1, text.length()-1));
             }

-          case 152: break;
-          case 57: 
+          case 156: break;
+          case 59: 

             { String text = yytext();
                      return sym(SCLTerminals.SYMBOL, text.substring(1, text.length()-1));
             }
             { String text = yytext();
                      return sym(SCLTerminals.SYMBOL, text.substring(1, text.length()-1));
             }

-          case 153: break;
-          case 58: 
+          case 157: break;
+          case 60: 

             { return sym(SCLTerminals.QUERY_OP);
             }
             { return sym(SCLTerminals.QUERY_OP);
             }

-          case 154: break;
-          case 59: 
+          case 158: break;
+          case 61: 

             { return sym(SCLTerminals.LET);
             }
             { return sym(SCLTerminals.LET);
             }

-          case 155: break;
-          case 60: 
+          case 159: break;
+          case 62: 

             { return sym(supportEDO() ? SCLTerminals.EDO : SCLTerminals.ID);
             }
             { return sym(supportEDO() ? SCLTerminals.EDO : SCLTerminals.ID);
             }

-          case 156: break;
-          case 61: 
+          case 160: break;
+          case 63: 

             { return sym(SCLTerminals.MDO);
             }
             { return sym(SCLTerminals.MDO);
             }

-          case 157: break;
-          case 62: 
+          case 161: break;
+          case 64: 

             { string.setLength(0); stringStart=yychar; yybegin(LONG_STRING); return sym(SCLTerminals.BEGIN_STRING);
             }
             { string.setLength(0); stringStart=yychar; yybegin(LONG_STRING); return sym(SCLTerminals.BEGIN_STRING);
             }

-          case 158: break;
-          case 63: 
+          case 162: break;
+          case 65: 

             { yybegin(YYINITIAL); 
                       return new Token(SCLTerminals.END_STRING, stringStart, yychar+3, string.toString());
             }
             { yybegin(YYINITIAL); 
                       return new Token(SCLTerminals.END_STRING, stringStart, yychar+3, string.toString());
             }

-          case 159: break;
-          case 64: 
+          case 163: break;
+          case 66: 

             { return sym(supportCHR() ? SCLTerminals.ID : SCLTerminals.RULE);
             }
             { return sym(supportCHR() ? SCLTerminals.ID : SCLTerminals.RULE);
             }

-          case 160: break;
-          case 65: 
+          case 164: break;
+          case 67: 

             { return sym(SCLTerminals.THEN);
             }
             { return sym(SCLTerminals.THEN);
             }

-          case 161: break;
-          case 66: 
+          case 165: break;
+          case 68: 

             { return sym(SCLTerminals.TYPE);
             }
             { return sym(SCLTerminals.TYPE);
             }

-          case 162: break;
-          case 67: 
+          case 166: break;
+          case 69: 

             { return sym(SCLTerminals.ELSE);
             }
             { return sym(SCLTerminals.ELSE);
             }

-          case 163: break;
-          case 68: 
+          case 167: break;
+          case 70: 

             { return sym(SCLTerminals.WITH);
             }
             { return sym(SCLTerminals.WITH);
             }

-          case 164: break;
-          case 69: 
+          case 168: break;
+          case 71: 

             { return sym(SCLTerminals.WHEN);
             }
             { return sym(SCLTerminals.WHEN);
             }

-          case 165: break;
-          case 70: 
+          case 169: break;
+          case 72: 

             { return sym(SCLTerminals.DATA);
             }
             { return sym(SCLTerminals.DATA);
             }

-          case 166: break;
-          case 71: 
+          case 170: break;
+          case 73: 

             { return sym(SCLTerminals.INFIX);
             }
             { return sym(SCLTerminals.INFIX);
             }

-          case 167: break;
-          case 72: 
+          case 171: break;
+          case 74: 

             { return sym(SCLTerminals.WHERE);
             }
             { return sym(SCLTerminals.WHERE);
             }

-          case 168: break;
-          case 73: 
+          case 172: break;
+          case 75: 

             { return sym(SCLTerminals.CLASS);
             }
             { return sym(SCLTerminals.CLASS);
             }

-          case 169: break;
-          case 74: 
+          case 173: break;
+          case 76: 

             { return sym(SCLTerminals.MATCH);
             }
             { return sym(SCLTerminals.MATCH);
             }

-          case 170: break;
-          case 75: 
+          case 174: break;
+          case 77: 

             { return sym(SCLTerminals.LAMBDA_MATCH);
             }
             { return sym(SCLTerminals.LAMBDA_MATCH);
             }

-          case 171: break;
-          case 76: 
+          case 175: break;
+          case 78: 

             { return sym(SCLTerminals.FORALL);
             }
             { return sym(SCLTerminals.FORALL);
             }

-          case 172: break;
-          case 77: 
+          case 176: break;
+          case 79: 

             { return sym(SCLTerminals.INFIXR);
             }
             { return sym(SCLTerminals.INFIXR);
             }

-          case 173: break;
-          case 78: 
+          case 177: break;
+          case 80: 

             { return sym(SCLTerminals.INFIXL);
             }
             { return sym(SCLTerminals.INFIXL);
             }

-          case 174: break;
-          case 79: 
+          case 178: break;
+          case 81: 

             { return sym(SCLTerminals.IMPORT);
             }
             { return sym(SCLTerminals.IMPORT);
             }

-          case 175: break;
-          case 80: 
+          case 179: break;
+          case 82: 

             { return sym(SCLTerminals.HIDING);
             }
             { return sym(SCLTerminals.HIDING);
             }

-          case 176: break;
-          case 81: 
+          case 180: break;
+          case 83: 

             { return sym(SCLTerminals.EFFECT);
             }
             { return sym(SCLTerminals.EFFECT);
             }

-          case 177: break;
-          case 82: 
+          case 181: break;
+          case 84: 

             { return sym(supportCHR() ? SCLTerminals.CHR_SELECT : SCLTerminals.SELECT);
             }
             { return sym(supportCHR() ? SCLTerminals.CHR_SELECT : SCLTerminals.SELECT);
             }

-          case 178: break;
-          case 83: 
+          case 182: break;
+          case 85: 

             { string.append((char)Integer.parseInt(yytext().substring(2), 16));
             }
             { string.append((char)Integer.parseInt(yytext().substring(2), 16));
             }

-          case 179: break;
-          case 84: 
+          case 183: break;
+          case 86: 

             { return sym(supportCHR() ? SCLTerminals.RULESET : SCLTerminals.ID);
             }
             { return sym(supportCHR() ? SCLTerminals.RULESET : SCLTerminals.ID);
             }

-          case 180: break;
-          case 85: 
+          case 184: break;
+          case 87: 

             { return sym(SCLTerminals.INCLUDE);
             }
             { return sym(SCLTerminals.INCLUDE);
             }

-          case 181: break;
-          case 86: 
+          case 185: break;
+          case 88: 

             { return sym(SCLTerminals.ENFORCE);
             }
             { return sym(SCLTerminals.ENFORCE);
             }

-          case 182: break;
-          case 87: 
+          case 186: break;
+          case 89: 

             { return sym(SCLTerminals.EXTENDS);
             }
             { return sym(SCLTerminals.EXTENDS);
             }

-          case 183: break;
-          case 88: 
+          case 187: break;
+          case 90: 

             { return sym(SCLTerminals.INSTANCE);
             }
             { return sym(SCLTerminals.INSTANCE);
             }

-          case 184: break;
-          case 89: 
+          case 188: break;
+          case 91: 

             { return sym(SCLTerminals.DERIVING);
             }
             { return sym(SCLTerminals.DERIVING);
             }

-          case 185: break;
-          case 90: 
+          case 189: break;
+          case 92: 

             { return sym(SCLTerminals.IMPORTJAVA);
             }
             { return sym(SCLTerminals.IMPORTJAVA);
             }

-          case 186: break;
-          case 91: 
+          case 190: break;
+          case 93: 

             { return sym(SCLTerminals.CONSTRAINT);
             }
             { return sym(SCLTerminals.CONSTRAINT);
             }

-          case 187: break;
-          case 92: 
+          case 191: break;
+          case 94: 

             { return sym(SCLTerminals.SELECT_FIRST);
             }
             { return sym(SCLTerminals.SELECT_FIRST);
             }

-          case 188: break;
-          case 93: 
+          case 192: break;
+          case 95: 

             { return sym(SCLTerminals.ABSTRACT_RULE);
             }
             { return sym(SCLTerminals.ABSTRACT_RULE);
             }

-          case 189: break;
-          case 94: 
+          case 193: break;
+          case 96: 

             { return sym(supportCHR() ? SCLTerminals.ID : SCLTerminals.TRANSFORMATION);
             }
             { return sym(supportCHR() ? SCLTerminals.ID : SCLTerminals.TRANSFORMATION);
             }

-          case 190: break;
-          case 95: 
+          case 194: break;
+          case 97: 

             { return sym(SCLTerminals.SELECT_DISTINCT);
             }
             { return sym(SCLTerminals.SELECT_DISTINCT);
             }

-          case 191: break;
-          case 96: 
+          case 195: break;
+          case 98: 

             { return sym(SCLTerminals.MAPPING_RELATION);
             }
             { return sym(SCLTerminals.MAPPING_RELATION);
             }

-          case 192: break;
+          case 196: break;

           default:
             zzScanError(ZZ_NO_MATCH);
         }
           default:
             zzScanError(ZZ_NO_MATCH);
         }

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.dat b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.dat
index c24abdb0f00e248cb7844d94fee23ae2c4d6b63b..69770a94064cca1633e4666371b7ed60f445a4f5 100644 (file)
Binary files a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.dat and b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.dat differ

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.java
index 6852771b1b8558f107758215e1e557d31dc56cf2..6278817097fffebc0c52fda65c6c7968a006f807 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLParser.java
@@ -13,15 +13,15 @@ public abstract class SCLParser {
     public static final boolean TRACE = false;
 
     private static final int INITIAL_CAPACITY = 16;
     public static final boolean TRACE = false;
 
     private static final int INITIAL_CAPACITY = 16;

-    private static final int STATE_COUNT = 363;
-    private static final int TERMINAL_COUNT = 86;
+    private static final int STATE_COUNT = 368;
+    private static final int TERMINAL_COUNT = 88;

     private static final int NONTERMINAL_COUNT = 52;
     private static final int NONTERMINAL_COUNT = 52;

-    private static final int PRODUCT_COUNT = 139;
+    private static final int PRODUCT_COUNT = 142;

     
     private static final int[] ACTION_ROW_ID = new int[STATE_COUNT];
     private static final int[] ACTION_COLUMN_ID = new int[TERMINAL_COUNT];
     
     private static final int[] ACTION_ROW_ID = new int[STATE_COUNT];
     private static final int[] ACTION_COLUMN_ID = new int[TERMINAL_COUNT];

-    private static final short[] ACTION_TABLE = new short[6765];
-    private static final int[] ERROR_TABLE = new int[976];
+    private static final short[] ACTION_TABLE = new short[6820];
+    private static final int[] ERROR_TABLE = new int[1012];

     private static final int[] GOTO_ROW_ID = new int[STATE_COUNT];
     private static final int[] GOTO_COLUMN_ID = new int[NONTERMINAL_COUNT];
     private static final short[] GOTO_TABLE = new short[1953];
     private static final int[] GOTO_ROW_ID = new int[STATE_COUNT];
     private static final int[] GOTO_COLUMN_ID = new int[NONTERMINAL_COUNT];
     private static final short[] GOTO_TABLE = new short[1953];


@@ -118,6 +118,8 @@ public abstract class SCLParser {
         "BY",
         "QUERY_OP",
         "FORALL",
         "BY",
         "QUERY_OP",
         "FORALL",

+        "DOUBLE_LESS",
+        "DOUBLE_GREATER",

         "COMMENT",
         "EOL",
         "EOF"
         "COMMENT",
         "EOL",
         "EOF"


@@ -397,19 +399,19 @@ public abstract class SCLParser {
         return parse(0);
     }
     public Object parseCommands() {
         return parse(0);
     }
     public Object parseCommands() {

-        return parse(347);
+        return parse(352);

     }
     public Object parseImport() {
     }
     public Object parseImport() {

-        return parse(355);
+        return parse(360);

     }
     public Object parseType() {
     }
     public Object parseType() {

-        return parse(357);
+        return parse(362);

     }
     public Object parseExp() {
     }
     public Object parseExp() {

-        return parse(359);
+        return parse(364);

     }
     public Object parseEquationBlock() {
     }
     public Object parseEquationBlock() {

-        return parse(361);
+        return parse(366);

     }
 
 
     }
 
 


@@ -517,170 +519,176 @@ public abstract class SCLParser {
         case 49:
             return reduceTypeVar();
         case 50:
         case 49:
             return reduceTypeVar();
         case 50:

-            return reduceTupleType();
+            return reducePlainEffect();

         case 51:
         case 51:

-            return reduceListType();
+            return reduceTupleType();

         case 52:
         case 52:

-            return reduceListTypeConstructor();
+            return reduceListType();

         case 53:
         case 53:

-            return reduceTupleTypeConstructor();
+            return reduceListTypeConstructor();

         case 54:
         case 54:

-            return reduceLambda();
+            return reduceTupleTypeConstructor();

         case 55:
         case 55:

-            return reduceLambdaMatch();
+            return reduceLambda();

         case 56:
         case 56:

-            return reduceLet();
+            return reduceLambdaMatch();

         case 57:
         case 57:

-            return reduceIf();
+            return reduceLet();

         case 58:
         case 58:

-            return reduceMatch();
+            return reduceIf();

         case 59:
         case 59:

-            return reduceDo();
+            return reduceMatch();

         case 60:
         case 60:

-            return reduceSelect();
+            return reduceDo();

         case 61:
         case 61:

-            return reduceCHRSelect();
+            return reduceSelect();

         case 62:
         case 62:

-            return reduceEnforce();
+            return reduceCHRSelect();

         case 63:
         case 63:

-            return reduceVar();
+            return reduceEnforce();

         case 64:
         case 64:

-            return reduceHashedId();
+            return reduceVar();

         case 65:
         case 65:

-            return reduceBlank();
+            return reduceHashedId();

         case 66:
         case 66:

-            return reduceInteger();
+            return reduceBlank();

         case 67:
         case 67:

-            return reduceFloat();
+            return reduceInteger();

         case 68:
         case 68:

-            return reduceString();
+            return reduceFloat();

         case 69:
         case 69:

-            return reduceChar();
+            return reduceString();

         case 70:
         case 70:

-            return reduceTuple();
+            return reduceChar();

         case 71:
         case 71:

-            return reduceViewPattern();
+            return reduceTuple();

         case 72:
         case 72:

-            return reduceRightSection();
+            return reduceViewPattern();

         case 73:
         case 73:

-            return reduceLeftSection();
+            return reduceRightSection();

         case 74:
         case 74:

-            return reduceListLiteral();
+            return reduceLeftSection();

         case 75:
         case 75:

-            return reduceRange();
+            return reduceListLiteral();

         case 76:
         case 76:

-            return reduceListComprehension();
+            return reduceRange();

         case 77:
         case 77:

-            return reduceAs();
+            return reduceListComprehension();

         case 78:
         case 78:

-            return reduceRecord();
+            return reduceAs();

         case 79:
         case 79:

-            return reduceTransformation();
+            return reduceRecord();

         case 80:
         case 80:

-            return reduceEq();
+            return reduceTransformation();

         case 81:
         case 81:

-            return reduceRuleDeclarations();
+            return reduceEq();

         case 82:
         case 82:

-            return reduceStatements();
+            return reduceRuleDeclarations();

         case 83:
         case 83:

-            return reduceImportShowing();
+            return reduceStatements();

         case 84:
         case 84:

-            return reduceImportHiding();
+            return reduceImportShowing();

         case 85:
         case 85:

-            return reduceImportValueItem();
+            return reduceImportHiding();

         case 86:
         case 86:

-            return reduceFieldDescription();
+            return reduceImportValueItem();

         case 87:
         case 87:

-            return reduceGuardedExpEq();
+            return reduceFieldDescription();

         case 88:
         case 88:

-            return reduceFundep();
+            return reduceGuardedExpEq();

         case 89:
         case 89:

-            return reduceQueryRuleDeclaration();
+            return reduceFundep();

         case 90:
         case 90:

-            return reduceAnnotation();
+            return reduceQueryRuleDeclaration();

         case 91:
         case 91:

-            return reduceGuardQuery();
+            return reduceAnnotation();

         case 92:
         case 92:

-            return reduceEqualsQuery();
+            return reduceGuardQuery();

         case 93:
         case 93:

-            return reduceBindQuery();
+            return reduceEqualsQuery();

         case 94:
         case 94:

-            return reduceCompositeQuery();
+            return reduceBindQuery();

         case 95:
         case 95:

-            return reduceApply();
+            return reduceCompositeQuery();

         case 96:
         case 96:

-            return reduceSymbol();
+            return reduceApply();

         case 97:
         case 97:

-            return reduceEscapedId();
+            return reduceSymbol();

         case 98:
         case 98:

-            return reduceMinus();
+            return reduceEscapedId();

         case 99:
         case 99:

-            return reduceLess();
+            return reduceMinus();

         case 100:
         case 100:

-            return reduceGreater();
+            return reduceLess();

         case 101:
         case 101:

-            return reduceDot();
+            return reduceGreater();

         case 102:
         case 102:

-            return reduceFieldAccess();
+            return reduceDoubleLess();

         case 103:
         case 103:

-            return reduceIdAccessor();
+            return reduceDoubleGreater();

         case 104:
         case 104:

-            return reduceStringAccessor();
+            return reduceDot();

         case 105:
         case 105:

-            return reduceExpAccessor();
+            return reduceFieldAccess();

         case 106:
         case 106:

-            return reduceCase();
+            return reduceIdAccessor();

         case 107:
         case 107:

-            return reduceQueryBlock();
+            return reduceStringAccessor();

         case 108:
         case 108:

-            return reduceVerboseCHRConjunction();
+            return reduceExpAccessor();

         case 109:
         case 109:

-            return reduceStringLiteral();
+            return reduceCase();

         case 110:
         case 110:

-            return reduceSymbol();
+            return reduceQueryBlock();

         case 111:
         case 111:

-            return reduceEscapedId();
+            return reduceVerboseCHRConjunction();

         case 112:
         case 112:

-            return reduceLess();
+            return reduceStringLiteral();

         case 113:
         case 113:

-            return reduceGreater();
+            return reduceSymbol();

         case 114:
         case 114:

-            return reduceDot();
+            return reduceEscapedId();

         case 115:
         case 115:

-            return reduceGuardQualifier();
+            return reduceLess();

         case 116:
         case 116:

-            return reduceLetQualifier();
+            return reduceGreater();

         case 117:
         case 117:

-            return reduceBindQualifier();
+            return reduceDot();

         case 118:
         case 118:

-            return reduceThenQualifier();
+            return reduceGuardQualifier();

         case 119:
         case 119:

-            return reduceCHRConjunction();
+            return reduceLetQualifier();

         case 120:
         case 120:

-            return reduceCHRAtom();
+            return reduceBindQualifier();

         case 121:
         case 121:

-            return reduceCHREquals();
+            return reduceThenQualifier();

         case 122:
         case 122:

-            return reduceCHRBinds();
+            return reduceCHRConjunction();

         case 123:
         case 123:

-            return reduceSimpleCaseRhs();
+            return reduceCHRAtom();

         case 124:
         case 124:

-            return reduceGuardedCaseRhs();
+            return reduceCHREquals();

         case 125:
         case 125:

-            return reduceGuardedExpArrow();
+            return reduceCHRBinds();

         case 126:
         case 126:

-            return reduceGuardEquation();
+            return reduceSimpleCaseRhs();

         case 127:
         case 127:

-            return reduceBasicEquation();
+            return reduceGuardedCaseRhs();

         case 128:
         case 128:

-            return reduceEffect();
+            return reduceGuardedExpArrow();

         case 129:
         case 129:

-            return reduceJustEtype();
+            return reduceGuardEquation();

         case 130:
         case 130:

-            return reduceForAll();
+            return reduceBasicEquation();

         case 131:
         case 131:

-            return reduceApplyType();
+            return reduceEffect();

         case 132:
         case 132:

+            return reduceJustEtype();
+        case 133:
+            return reduceForAll();
+        case 134:
+            return reduceApplyType();
+        case 135:

             return reduceDummy();
 
         default:
             return reduceDummy();
 
         default:


@@ -901,6 +909,10 @@ public abstract class SCLParser {
      * atype ::= ID
      */
     protected abstract Object reduceTypeVar();
      * atype ::= ID
      */
     protected abstract Object reduceTypeVar();

+    /**
+     * atype ::= DOUBLE_LESS ID (COMMA ID)* DOUBLE_GREATER
+     */
+    protected abstract Object reducePlainEffect();

     /**
      * atype ::= LPAREN (type (COMMA (type COMMA)* type)?)? RPAREN
      */
     /**
      * atype ::= LPAREN (type (COMMA (type COMMA)* type)?)? RPAREN
      */


@@ -1101,6 +1113,14 @@ public abstract class SCLParser {
      * symbol ::= GREATER
      */
     protected abstract Object reduceGreater();
      * symbol ::= GREATER
      */
     protected abstract Object reduceGreater();

+    /**
+     * symbol ::= DOUBLE_LESS
+     */
+    protected abstract Object reduceDoubleLess();
+    /**
+     * symbol ::= DOUBLE_GREATER
+     */
+    protected abstract Object reduceDoubleGreater();

     /**
      * symbol ::= SEPARATED_DOT
      */
     /**
      * symbol ::= SEPARATED_DOT
      */

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 9c1a61535531e97b55acf36d0d6830e3b0ec6313..08200a44dfd59bd50d5ea788c649abcf7e8ca146 100644 (file)
--- 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
@@ -111,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.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;
 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;


@@ -822,6 +823,16 @@ public class SCLParserImpl extends SCLParser {
     protected Object reduceGreater() {
         return new EVar(((Token)get(0)).text);
     }
     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() {
 
     @Override
     protected Object reduceDot() {


@@ -1356,4 +1367,16 @@ public class SCLParserImpl extends SCLParser {
         return new FieldAssignment(FieldAssignment.WILDCARD, null);
     }
 
         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);
+    }
+

 }
 }

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLTerminals.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLTerminals.java
index 76850ca9f7c1919ed5133705edc3219ce615625b..ed3da1013cf376887bdb1629b73c30e01fd18919 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLTerminals.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/parser/SCLTerminals.java
@@ -84,7 +84,9 @@ public interface SCLTerminals {
     public static final int BY = 80;
     public static final int QUERY_OP = 81;
     public static final int FORALL = 82;
     public static final int BY = 80;
     public static final int QUERY_OP = 81;
     public static final int FORALL = 82;

-    public static final int COMMENT = 83;
-    public static final int EOL = 84;
-    public static final int EOF = 85;
+    public static final int DOUBLE_LESS = 83;
+    public static final int DOUBLE_GREATER = 84;
+    public static final int COMMENT = 85;
+    public static final int EOL = 86;
+    public static final int EOF = 87;

 }
 }

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/types/TPlainEffectAst.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/types/TPlainEffectAst.java
new file mode 100644 (file)
index 0000000..bda0176
--- /dev/null
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/parsing/types/TPlainEffectAst.java
@@ -0,0 +1,61 @@
+package org.simantics.scl.compiler.internal.parsing.types;
+
+import java.util.ArrayList;
+
+import org.simantics.scl.compiler.elaboration.contexts.TypeTranslationContext;
+import org.simantics.scl.compiler.internal.types.TypeElaborationContext;
+import org.simantics.scl.compiler.types.Type;
+import org.simantics.scl.compiler.types.kinds.Kind;
+
+import gnu.trove.map.hash.TObjectIntHashMap;
+import gnu.trove.set.hash.TIntHashSet;
+
+
+
+public class TPlainEffectAst extends TypeAst {
+    public final TypeAst[] effects;
+    
+    public TPlainEffectAst(TypeAst[] effects) {
+        this.effects = effects;
+    }
+    
+    public TPlainEffectAst(ArrayList<TypeAst> effects) {
+        this(effects.toArray(new TypeAst[effects.size()]));
+    }
+
+    @Override
+    public void toString(StringBuilder b) {
+        b.append("<<");
+        boolean first = true;
+        for(TypeAst effect : effects) {
+            if(first)
+                first = false;
+            else
+                b.append(",");
+            effect.toString(b);
+        }
+        b.append(">>");
+    }
+
+    @Override
+    public Type toType(TypeTranslationContext context, Kind expectedKind) {
+        return TFunctionAst.toEffect(context, effects);
+    }
+    
+    @Override
+    public Type toType(TypeElaborationContext context) {
+        return TFunctionAst.toEffect(context, effects);
+    }
+
+    @Override
+    public int getPrecedence() {
+        return 0;
+    }
+
+    @Override
+    public void collectReferences(TObjectIntHashMap<String> typeNameMap,
+            TIntHashSet set) {
+        for(TypeAst effect : effects)
+            effect.collectReferences(typeNameMap, set);
+    }
+}

diff --git a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/types/effects/EffectIdMap.java b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/types/effects/EffectIdMap.java
index 4168fff931241574484b794ce94e40fe4de043b0..8ba0e6783a149aecd08fe9281063bf6d7b9b9cc3 100644 (file)
--- a/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/types/effects/EffectIdMap.java
+++ b/bundles/org.simantics.scl.compiler/src/org/simantics/scl/compiler/internal/types/effects/EffectIdMap.java
@@ -17,19 +17,17 @@ public class EffectIdMap {
     public static final int MAX = 0xffffffff;
     private static final int FIRST_FREE_EFFECT_ID = 16;
     
     public static final int MAX = 0xffffffff;
     private static final int FIRST_FREE_EFFECT_ID = 16;
     

-    private static ArrayList<TCon> effectCons = new ArrayList<TCon>(); 
-    private static TObjectIntHashMap<TCon> effectCodes = new TObjectIntHashMap<TCon>();
+    private static ArrayList<TCon> EFFECT_CONS = new ArrayList<TCon>(); 
+    private static TObjectIntHashMap<TCon> EFFECT_CODES = new TObjectIntHashMap<TCon>();

     
     

-    private static void add(String module, String name, int code) {
-        TCon con = Types.con(module, name);
-        effectCodes.put(con, code);
-        effectCons.add(con);
+    private static void add(TCon con, int code) {
+        EFFECT_CODES.put(con, code);
+        EFFECT_CONS.add(con);

     }
     
     static {
     }
     
     static {

-        add("Simantics/DB", "WriteGraph", 12);
-        add("Simantics/DB", "ReadGraph",  4);
-        add(Types.BUILTIN, "Proc",       1);
+        add(Types.WRITE_GRAPH, 0b11);
+        add(Types.READ_GRAPH,  0b01);

     }
     
     private ArrayList<Type> localCons = new ArrayList<Type>(); 
     }
     
     private ArrayList<Type> localCons = new ArrayList<Type>(); 


@@ -44,8 +42,8 @@ public class EffectIdMap {
                 id |= toId(e, metaVars);
             return id;
         }
                 id |= toId(e, metaVars);
             return id;
         }

-        else if(effectCodes.contains(type)) {
-            return effectCodes.get(type);
+        else if(EFFECT_CODES.contains(type)) {
+            return EFFECT_CODES.get(type);

         }
         else if(type instanceof TMetaVar) {
             metaVars.add((TMetaVar)type);
         }
         else if(type instanceof TMetaVar) {
             metaVars.add((TMetaVar)type);


@@ -67,8 +65,8 @@ public class EffectIdMap {
         if(id == 0)
             return Types.NO_EFFECTS;
         ArrayList<Type> components = new ArrayList<Type>();
         if(id == 0)
             return Types.NO_EFFECTS;
         ArrayList<Type> components = new ArrayList<Type>();

-        for(TCon con : effectCons) {
-            int conId = effectCodes.get(con);
+        for(TCon con : EFFECT_CONS) {
+            int conId = EFFECT_CODES.get(con);

             if((id&conId) == conId) {
                 components.add(con);
                 id ^= conId;
             if((id&conId) == conId) {
                 components.add(con);
                 id ^= conId;

diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/ModuleRegressionTests.java b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/ModuleRegressionTests.java
index 3eb098933c1f6e2b5975920fb20c663c119a31d1..8c2053e6f3db2cea06b8b9b19e6a558810aa595e 100644 (file)
--- a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/ModuleRegressionTests.java
+++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/ModuleRegressionTests.java
@@ -136,6 +136,7 @@ public class ModuleRegressionTests extends TestBase {
     @Test public void JavaMethods() { test(); }
     @Test public void JavaTypes() { test(); }
     @Test public void Kinds1() { test(); }
     @Test public void JavaMethods() { test(); }
     @Test public void JavaTypes() { test(); }
     @Test public void Kinds1() { test(); }

+    @Test public void Lazy1() { test(); }

     @Test public void Lambda() { test(); }
     @Test public void LambdaMatch() { test(); }
     @Test public void Layout1() { test(); }
     @Test public void Lambda() { test(); }
     @Test public void LambdaMatch() { test(); }
     @Test public void Layout1() { test(); }

diff --git a/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Lazy1.scl b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Lazy1.scl
new file mode 100644 (file)
index 0000000..7989992
--- /dev/null
+++ b/tests/org.simantics.scl.compiler.tests/src/org/simantics/scl/compiler/tests/scl/Lazy1.scl
@@ -0,0 +1,36 @@
+import "Prelude"
+import "Lazy"
+
+data Node = Node {
+    name :: String,
+    children :: Lazy <<Proc>> [Node]
+}
+
+root = genNode ""
+  where
+    genNode name = do
+        print "genNode \(name)"
+        Node {
+            name,
+            children = lazy [genNode (name + "A"), genNode (name + "B")]
+        }
+
+nameOf Node { name } = name
+childrenOf Node { children } = force children
+
+main = for (childrenOf root) $ \c ->
+    for (childrenOf c) $ \c2 ->
+        print "visit \(nameOf c2)"
+--
+genNode 
+genNode A
+genNode B
+genNode AA
+genNode AB
+visit AA
+visit AB
+genNode BA
+genNode BB
+visit BA
+visit BB
+()
\ No newline at end of file