diff --git a/confluence/.idea/ant.xml b/confluence/.idea/ant.xml
index 2581ca3fe84..dd6fe2b2026 100644
--- a/confluence/.idea/ant.xml
+++ b/confluence/.idea/ant.xml
@@ -2,6 +2,14 @@
 <project version="4">
   <component name="AntConfiguration">
     <defaultAnt bundledAnt="true" />
+    <buildFile url="file://$PROJECT_DIR$/buildConfluenceLexer.xml">
+      <additionalClassPath />
+      <antReference projectDefault="true" />
+      <customJdkName value="" />
+      <maximumHeapSize value="128" />
+      <maximumStackSize value="2" />
+      <properties />
+    </buildFile>
   </component>
 </project>
 
diff --git a/confluence/.idea/misc.xml b/confluence/.idea/misc.xml
index 84dcf70e2f6..aed7c788205 100644
--- a/confluence/.idea/misc.xml
+++ b/confluence/.idea/misc.xml
@@ -1,44 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="DaemonCodeAnalyzer">
-    <disable_hints />
-  </component>
-  <component name="DebuggerManager">
-    <breakpoint_any>
-      <breakpoint>
-        <option name="NOTIFY_CAUGHT" value="true" />
-        <option name="NOTIFY_UNCAUGHT" value="true" />
-        <option name="ENABLED" value="false" />
-        <option name="LOG_ENABLED" value="false" />
-        <option name="LOG_EXPRESSION_ENABLED" value="false" />
-        <option name="SUSPEND_POLICY" value="SuspendAll" />
-        <option name="COUNT_FILTER_ENABLED" value="false" />
-        <option name="COUNT_FILTER" value="0" />
-        <option name="CONDITION_ENABLED" value="false" />
-        <option name="CLASS_FILTERS_ENABLED" value="false" />
-        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-        <option name="CONDITION" value="" />
-        <option name="LOG_MESSAGE" value="" />
-      </breakpoint>
-      <breakpoint>
-        <option name="NOTIFY_CAUGHT" value="true" />
-        <option name="NOTIFY_UNCAUGHT" value="true" />
-        <option name="ENABLED" value="false" />
-        <option name="LOG_ENABLED" value="false" />
-        <option name="LOG_EXPRESSION_ENABLED" value="false" />
-        <option name="SUSPEND_POLICY" value="SuspendAll" />
-        <option name="COUNT_FILTER_ENABLED" value="false" />
-        <option name="COUNT_FILTER" value="0" />
-        <option name="CONDITION_ENABLED" value="false" />
-        <option name="CLASS_FILTERS_ENABLED" value="false" />
-        <option name="INSTANCE_FILTERS_ENABLED" value="false" />
-        <option name="CONDITION" value="" />
-        <option name="LOG_MESSAGE" value="" />
-      </breakpoint>
-    </breakpoint_any>
-    <breakpoint_rules />
-    <ui_properties />
-  </component>
   <component name="EntryPointsManager">
     <entry_points version="2.0" />
   </component>
@@ -70,107 +31,12 @@
     <option name="LAST_EDITED_MODULE_NAME" />
     <option name="LAST_EDITED_TAB_NAME" />
   </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectReloadState">
-    <option name="STATE" value="0" />
-  </component>
   <component name="ProjectResources">
     <default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype>
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/classes" />
   </component>
-  <component name="RunManager">
-    <configuration default="true" type="Remote" factoryName="Remote">
-      <option name="USE_SOCKET_TRANSPORT" value="true" />
-      <option name="SERVER_MODE" value="false" />
-      <option name="SHMEM_ADDRESS" value="javadebug" />
-      <option name="HOST" value="localhost" />
-      <option name="PORT" value="5005" />
-      <method>
-        <option name="AntTarget" enabled="false" />
-        <option name="BuildArtifacts" enabled="false" />
-        <option name="Maven.BeforeRunTask" enabled="false" />
-      </method>
-    </configuration>
-    <configuration default="true" type="Applet" factoryName="Applet">
-      <module name="" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="HTML_FILE_NAME" />
-      <option name="HTML_USED" value="false" />
-      <option name="WIDTH" value="400" />
-      <option name="HEIGHT" value="300" />
-      <option name="POLICY_FILE" value="$APPLICATION_HOME_DIR$/bin/appletviewer.policy" />
-      <option name="VM_PARAMETERS" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <method>
-        <option name="AntTarget" enabled="false" />
-        <option name="BuildArtifacts" enabled="false" />
-        <option name="Make" enabled="true" />
-        <option name="Maven.BeforeRunTask" enabled="false" />
-      </method>
-    </configuration>
-    <configuration default="true" type="Application" factoryName="Application">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="ENABLE_SWING_INSPECTOR" value="false" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <module name="" />
-      <envs />
-      <method>
-        <option name="AntTarget" enabled="false" />
-        <option name="BuildArtifacts" enabled="false" />
-        <option name="Make" enabled="true" />
-        <option name="Maven.BeforeRunTask" enabled="false" />
-      </method>
-    </configuration>
-    <configuration default="true" type="JUnit" factoryName="JUnit">
-      <module name="" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <option name="PACKAGE_NAME" />
-      <option name="MAIN_CLASS_NAME" />
-      <option name="METHOD_NAME" />
-      <option name="TEST_OBJECT" value="class" />
-      <option name="VM_PARAMETERS" />
-      <option name="PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ENV_VARIABLES" />
-      <option name="PASS_PARENT_ENVS" value="true" />
-      <option name="TEST_SEARCH_SCOPE">
-        <value defaultName="moduleWithDependencies" />
-      </option>
-      <envs />
-      <patterns />
-      <method>
-        <option name="AntTarget" enabled="false" />
-        <option name="BuildArtifacts" enabled="false" />
-        <option name="Make" enabled="true" />
-        <option name="Maven.BeforeRunTask" enabled="false" />
-      </method>
-    </configuration>
-    <list size="0" />
-    <configuration name="&lt;template&gt;" type="WebApp" default="true" selected="false">
-      <Host>localhost</Host>
-      <Port>5050</Port>
-    </configuration>
-  </component>
-  <component name="ShelveChangesManager" show_recycled="false" />
   <component name="SvnConfiguration" maxAnnotateRevisions="500">
     <option name="USER" value="" />
     <option name="PASSWORD" value="" />
diff --git a/confluence/buildConfluenceLexer.xml b/confluence/buildConfluenceLexer.xml
index eb1897d655a..e0f993ff491 100644
--- a/confluence/buildConfluenceLexer.xml
+++ b/confluence/buildConfluenceLexer.xml
@@ -1,6 +1,6 @@
 <project name="ConfluenceLexer" default="confluenceLexer">
     <property name="home" value="${basedir}"/>
-    <property file="${home}/../frontend/idea.properties"/>
+    <property file="${home}/../compiler/frontend/idea.properties"/>
 
     <property name="flex.base" value="${idea.home}/tools/lexer/jflex-1.4"/>
     <property name="out.dir" value="${basedir}/tmpout"/>
@@ -38,9 +38,9 @@
     <target name="confluenceLexer">
         <echo message="${flex.base}"/>
         <echo message="${home}"/>
-        <flex flexfile="${home}/../idea/src/org/jetbrains/jet/lexer/Jet.flex"
+        <flex flexfile="${home}/../compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex"
               destdir="${home}/src/main/java/org/jetbrains/jet/lexer/"/>
-        <copy file="${home}/../idea/src/org/jetbrains/jet/lexer/JetTokens.java"
+        <copy file="${home}/../compiler/frontend/src/org/jetbrains/jet/lexer/JetTokens.java"
                   tofile="${home}/src/main/java/org/jetbrains/jet/lexer/JetTokens.java" overwrite="true"/>
     </target>
-</project>
+</project>
\ No newline at end of file
diff --git a/confluence/src/main/java/org/jetbrains/jet/lexer/JetTokens.java b/confluence/src/main/java/org/jetbrains/jet/lexer/JetTokens.java
index ad09df44b17..e2cd5e0282f 100644
--- a/confluence/src/main/java/org/jetbrains/jet/lexer/JetTokens.java
+++ b/confluence/src/main/java/org/jetbrains/jet/lexer/JetTokens.java
@@ -17,10 +17,8 @@ public interface JetTokens {
     IElementType WHITE_SPACE = TokenType.WHITE_SPACE;
 
     JetToken INTEGER_LITERAL    = new JetToken("INTEGER_LITERAL");
-    JetToken LONG_LITERAL       = new JetToken("LONG_LITERAL");
     JetToken FLOAT_LITERAL      = new JetToken("FLOAT_CONSTANT");
     JetToken CHARACTER_LITERAL  = new JetToken("CHARACTER_LITERAL");
-//    JetToken STRING_LITERAL     = new JetToken("STRING_LITERAL");
 
     JetToken CLOSING_QUOTE = new JetToken("CLOSING_QUOTE");
     JetToken OPEN_QUOTE = new JetToken("OPEN_QUOTE");
@@ -38,6 +36,7 @@ public interface JetTokens {
     JetKeywordToken TYPE_KEYWORD             = JetKeywordToken.keyword("type");
     JetKeywordToken CLASS_KEYWORD            = JetKeywordToken.keyword("class");
     JetKeywordToken THIS_KEYWORD             = JetKeywordToken.keyword("this");
+    JetKeywordToken SUPER_KEYWORD             = JetKeywordToken.keyword("super");
     JetKeywordToken VAL_KEYWORD              = JetKeywordToken.keyword("val");
     JetKeywordToken VAR_KEYWORD              = JetKeywordToken.keyword("var");
     JetKeywordToken FUN_KEYWORD              = JetKeywordToken.keyword("fun");
@@ -58,6 +57,7 @@ public interface JetTokens {
     JetKeywordToken WHILE_KEYWORD            = JetKeywordToken.keyword("while");
     JetKeywordToken DO_KEYWORD               = JetKeywordToken.keyword("do");
     JetKeywordToken WHEN_KEYWORD            = JetKeywordToken.keyword("when");
+    JetKeywordToken TRAIT_KEYWORD     = JetKeywordToken.keyword("trait");
     // TODO: Discuss "This" keyword
     JetKeywordToken CAPITALIZED_THIS_KEYWORD = JetKeywordToken.keyword("This");
 
@@ -120,17 +120,15 @@ public interface JetTokens {
     JetToken COMMA       = new JetToken("COMMA");
 
     JetToken EOL_OR_SEMICOLON   = new JetToken("EOL_OR_SEMICOLON");
-    JetKeywordToken WRAPS_KEYWORD     = JetKeywordToken.softKeyword("wraps");
     JetKeywordToken IMPORT_KEYWORD    = JetKeywordToken.softKeyword("import");
     JetKeywordToken WHERE_KEYWORD     = JetKeywordToken.softKeyword("where");
     JetKeywordToken BY_KEYWORD        = JetKeywordToken.softKeyword("by");
     JetKeywordToken GET_KEYWORD       = JetKeywordToken.softKeyword("get");
     JetKeywordToken SET_KEYWORD       = JetKeywordToken.softKeyword("set");
     JetKeywordToken ABSTRACT_KEYWORD  = JetKeywordToken.softKeyword("abstract");
-    JetKeywordToken VIRTUAL_KEYWORD   = JetKeywordToken.softKeyword("open");
     JetKeywordToken ENUM_KEYWORD      = JetKeywordToken.softKeyword("enum");
     JetKeywordToken OPEN_KEYWORD      = JetKeywordToken.softKeyword("open");
-    JetKeywordToken ATTRIBUTE_KEYWORD = JetKeywordToken.softKeyword("attribute");
+    JetKeywordToken ANNOTATION_KEYWORD = JetKeywordToken.softKeyword("annotation");
     JetKeywordToken OVERRIDE_KEYWORD  = JetKeywordToken.softKeyword("override");
     JetKeywordToken PRIVATE_KEYWORD   = JetKeywordToken.softKeyword("private");
     JetKeywordToken PUBLIC_KEYWORD    = JetKeywordToken.softKeyword("public");
@@ -138,14 +136,17 @@ public interface JetTokens {
     JetKeywordToken PROTECTED_KEYWORD = JetKeywordToken.softKeyword("protected");
     JetKeywordToken CATCH_KEYWORD     = JetKeywordToken.softKeyword("catch");
     JetKeywordToken OUT_KEYWORD       = JetKeywordToken.softKeyword("out");
+    JetKeywordToken VARARG_KEYWORD       = JetKeywordToken.softKeyword("vararg");
+    JetKeywordToken INLINE_KEYWORD       = JetKeywordToken.softKeyword("inline");
 
     JetKeywordToken FINALLY_KEYWORD   = JetKeywordToken.softKeyword("finally");
+    JetKeywordToken FINAL_KEYWORD   = JetKeywordToken.softKeyword("final");
 
     // TODO: support this as an annotation on arguments. Then, they it probably can not be a soft keyword
     JetKeywordToken REF_KEYWORD       = JetKeywordToken.softKeyword("ref");
 
-    TokenSet KEYWORDS = TokenSet.create(NAMESPACE_KEYWORD, AS_KEYWORD, TYPE_KEYWORD, CLASS_KEYWORD,
-            THIS_KEYWORD, VAL_KEYWORD, VAR_KEYWORD, FUN_KEYWORD, FOR_KEYWORD,
+    TokenSet KEYWORDS = TokenSet.create(NAMESPACE_KEYWORD, AS_KEYWORD, TYPE_KEYWORD, CLASS_KEYWORD, TRAIT_KEYWORD,
+            THIS_KEYWORD, SUPER_KEYWORD, VAL_KEYWORD, VAR_KEYWORD, FUN_KEYWORD, FOR_KEYWORD,
             NULL_KEYWORD,
             TRUE_KEYWORD, FALSE_KEYWORD, IS_KEYWORD,
             IN_KEYWORD, THROW_KEYWORD, RETURN_KEYWORD, BREAK_KEYWORD, CONTINUE_KEYWORD, OBJECT_KEYWORD, IF_KEYWORD,
@@ -153,15 +154,15 @@ public interface JetTokens {
             NOT_IN, NOT_IS, CAPITALIZED_THIS_KEYWORD, AS_SAFE
     );
 
-    TokenSet SOFT_KEYWORDS = TokenSet.create(WRAPS_KEYWORD, IMPORT_KEYWORD, WHERE_KEYWORD, BY_KEYWORD, GET_KEYWORD,
-            SET_KEYWORD, ABSTRACT_KEYWORD, VIRTUAL_KEYWORD, ENUM_KEYWORD, OPEN_KEYWORD, ATTRIBUTE_KEYWORD,
+    TokenSet SOFT_KEYWORDS = TokenSet.create(IMPORT_KEYWORD, WHERE_KEYWORD, BY_KEYWORD, GET_KEYWORD,
+            SET_KEYWORD, ABSTRACT_KEYWORD, ENUM_KEYWORD, OPEN_KEYWORD, ANNOTATION_KEYWORD,
             OVERRIDE_KEYWORD, PRIVATE_KEYWORD, PUBLIC_KEYWORD, INTERNAL_KEYWORD, PROTECTED_KEYWORD,
-            CATCH_KEYWORD, FINALLY_KEYWORD, REF_KEYWORD, OUT_KEYWORD
+            CATCH_KEYWORD, FINALLY_KEYWORD, REF_KEYWORD, OUT_KEYWORD, FINAL_KEYWORD, VARARG_KEYWORD, INLINE_KEYWORD
     );
 
-    TokenSet MODIFIER_KEYWORDS = TokenSet.create(ABSTRACT_KEYWORD, VIRTUAL_KEYWORD, ENUM_KEYWORD,
-            OPEN_KEYWORD, ATTRIBUTE_KEYWORD, OVERRIDE_KEYWORD, PRIVATE_KEYWORD, PUBLIC_KEYWORD, INTERNAL_KEYWORD,
-            PROTECTED_KEYWORD, REF_KEYWORD, OUT_KEYWORD, IN_KEYWORD
+    TokenSet MODIFIER_KEYWORDS = TokenSet.create(ABSTRACT_KEYWORD, ENUM_KEYWORD,
+            OPEN_KEYWORD, ANNOTATION_KEYWORD, OVERRIDE_KEYWORD, PRIVATE_KEYWORD, PUBLIC_KEYWORD, INTERNAL_KEYWORD,
+            PROTECTED_KEYWORD, REF_KEYWORD, OUT_KEYWORD, IN_KEYWORD, FINAL_KEYWORD, VARARG_KEYWORD, INLINE_KEYWORD
     );
     TokenSet WHITE_SPACE_OR_COMMENT_BIT_SET = TokenSet.create(WHITE_SPACE, BLOCK_COMMENT, EOL_COMMENT, DOC_COMMENT);
     TokenSet WHITESPACES = TokenSet.create(TokenType.WHITE_SPACE);
@@ -169,12 +170,14 @@ public interface JetTokens {
 
     TokenSet STRINGS = TokenSet.create(CHARACTER_LITERAL, REGULAR_STRING_PART, RAW_STRING_LITERAL);
     TokenSet OPERATIONS = TokenSet.create(AS_KEYWORD, AS_SAFE, IS_KEYWORD, IN_KEYWORD, DOT, PLUSPLUS, MINUSMINUS, MUL, PLUS,
-            MINUS, EXCL, DIV, PERC, LT, GT, LTEQ, GTEQ, EQEQEQ, ARROW, EXCLEQEQEQ, EQEQ, EXCLEQ, ANDAND, OROR,
+            MINUS, EXCL, DIV, PERC, LT, GT, LTEQ, GTEQ, EQEQEQ, EXCLEQEQEQ, EQEQ, EXCLEQ, ANDAND, OROR,
             SAFE_ACCESS, ELVIS,
 //            MAP, FILTER,
             QUEST, COLON,
             RANGE, EQ, MULTEQ, DIVEQ, PERCEQ, PLUSEQ, MINUSEQ,
-            NOT_IN, NOT_IS, HASH, IDENTIFIER, LABEL_IDENTIFIER, ATAT, AT);
+            NOT_IN, NOT_IS,
+//            HASH,
+            IDENTIFIER, LABEL_IDENTIFIER, ATAT, AT);
 
     TokenSet AUGMENTED_ASSIGNMENTS = TokenSet.create(PLUSEQ, MINUSEQ, MULTEQ, PERCEQ, DIVEQ);
 }
diff --git a/confluence/src/main/java/org/jetbrains/jet/lexer/_JetLexer.java b/confluence/src/main/java/org/jetbrains/jet/lexer/_JetLexer.java
index 5f4033af787..56802c16919 100644
--- a/confluence/src/main/java/org/jetbrains/jet/lexer/_JetLexer.java
+++ b/confluence/src/main/java/org/jetbrains/jet/lexer/_JetLexer.java
@@ -1,6 +1,5 @@
-/* The following code was generated by JFlex 1.4.3 on 7/12/11 9:54 PM */
+/* The following code was generated by JFlex 1.4.3 on 1/10/12 4:31 PM */
 
-/* It's an automatically generated code. Do not modify it. */
 package org.jetbrains.jet.lexer;
 
 import java.util.*;
@@ -14,8 +13,8 @@ import org.jetbrains.jet.lexer.JetTokens;
 /**
  * This class is a scanner generated by 
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.3
- * on 7/12/11 9:54 PM from the specification file
- * <tt>/Users/abreslav/work/jet/confluence/../idea/src/org/jetbrains/jet/lexer/Jet.flex</tt>
+ * on 1/10/12 4:31 PM from the specification file
+ * <tt>/Users/abreslav/work/jet/confluence/../compiler/frontend/src/org/jetbrains/jet/lexer/Jet.flex</tt>
  */
 class _JetLexer implements FlexLexer {
   /** initial size of the lookahead buffer */
@@ -41,73 +40,73 @@ class _JetLexer implements FlexLexer {
    * Translates characters to character classes
    */
   private static final String ZZ_CMAP_PACKED = 
-    "\11\0\1\3\1\13\1\0\1\3\23\0\1\3\1\60\1\25\1\77"+
-    "\1\7\1\70\1\65\1\23\1\73\1\74\1\12\1\62\1\76\1\21"+
-    "\1\17\1\11\1\14\11\1\1\67\1\75\1\63\1\57\1\64\1\61"+
-    "\1\10\1\2\1\16\2\2\1\20\1\2\5\4\1\4\3\4\1\22"+
-    "\3\4\1\54\3\4\1\15\2\4\1\71\1\24\1\72\1\0\1\4"+
-    "\1\6\1\31\1\44\1\36\1\56\1\33\1\52\1\4\1\47\1\41"+
-    "\1\45\1\51\1\50\1\32\1\30\1\37\1\35\1\4\1\43\1\34"+
-    "\1\40\1\42\1\55\1\46\1\15\1\53\1\4\1\26\1\66\1\27"+
-    "\54\0\1\4\12\0\1\4\4\0\1\4\5\0\27\4\1\0\37\4"+
-    "\1\0\u013f\4\31\0\162\4\4\0\14\4\16\0\5\4\11\0\1\4"+
-    "\213\0\1\4\13\0\1\4\1\0\3\4\1\0\1\4\1\0\24\4"+
-    "\1\0\54\4\1\0\46\4\1\0\5\4\4\0\202\4\10\0\105\4"+
-    "\1\0\46\4\2\0\2\4\6\0\20\4\41\0\46\4\2\0\1\4"+
-    "\7\0\47\4\110\0\33\4\5\0\3\4\56\0\32\4\5\0\13\4"+
-    "\25\0\12\5\4\0\2\4\1\0\143\4\1\0\1\4\17\0\2\4"+
-    "\7\0\2\4\12\5\3\4\2\0\1\4\20\0\1\4\1\0\36\4"+
-    "\35\0\3\4\60\0\46\4\13\0\1\4\u0152\0\66\4\3\0\1\4"+
-    "\22\0\1\4\7\0\12\4\4\0\12\5\25\0\10\4\2\0\2\4"+
-    "\2\0\26\4\1\0\7\4\1\0\1\4\3\0\4\4\3\0\1\4"+
-    "\36\0\2\4\1\0\3\4\4\0\12\5\2\4\23\0\6\4\4\0"+
-    "\2\4\2\0\26\4\1\0\7\4\1\0\2\4\1\0\2\4\1\0"+
-    "\2\4\37\0\4\4\1\0\1\4\7\0\12\5\2\0\3\4\20\0"+
-    "\11\4\1\0\3\4\1\0\26\4\1\0\7\4\1\0\2\4\1\0"+
-    "\5\4\3\0\1\4\22\0\1\4\17\0\2\4\4\0\12\5\25\0"+
-    "\10\4\2\0\2\4\2\0\26\4\1\0\7\4\1\0\2\4\1\0"+
-    "\5\4\3\0\1\4\36\0\2\4\1\0\3\4\4\0\12\5\1\0"+
-    "\1\4\21\0\1\4\1\0\6\4\3\0\3\4\1\0\4\4\3\0"+
-    "\2\4\1\0\1\4\1\0\2\4\3\0\2\4\3\0\3\4\3\0"+
-    "\10\4\1\0\3\4\55\0\11\5\25\0\10\4\1\0\3\4\1\0"+
-    "\27\4\1\0\12\4\1\0\5\4\46\0\2\4\4\0\12\5\25\0"+
-    "\10\4\1\0\3\4\1\0\27\4\1\0\12\4\1\0\5\4\3\0"+
-    "\1\4\40\0\1\4\1\0\2\4\4\0\12\5\25\0\10\4\1\0"+
-    "\3\4\1\0\27\4\1\0\20\4\46\0\2\4\4\0\12\5\25\0"+
-    "\22\4\3\0\30\4\1\0\11\4\1\0\1\4\2\0\7\4\72\0"+
-    "\60\4\1\0\2\4\14\0\7\4\11\0\12\5\47\0\2\4\1\0"+
-    "\1\4\2\0\2\4\1\0\1\4\2\0\1\4\6\0\4\4\1\0"+
-    "\7\4\1\0\3\4\1\0\1\4\1\0\1\4\2\0\2\4\1\0"+
-    "\4\4\1\0\2\4\11\0\1\4\2\0\5\4\1\0\1\4\11\0"+
-    "\12\5\2\0\2\4\42\0\1\4\37\0\12\5\26\0\10\4\1\0"+
-    "\42\4\35\0\4\4\164\0\42\4\1\0\5\4\1\0\2\4\25\0"+
-    "\12\5\6\0\6\4\112\0\46\4\12\0\51\4\7\0\132\4\5\0"+
-    "\104\4\5\0\122\4\6\0\7\4\1\0\77\4\1\0\1\4\1\0"+
-    "\4\4\2\0\7\4\1\0\1\4\1\0\4\4\2\0\47\4\1\0"+
-    "\1\4\1\0\4\4\2\0\37\4\1\0\1\4\1\0\4\4\2\0"+
-    "\7\4\1\0\1\4\1\0\4\4\2\0\7\4\1\0\7\4\1\0"+
-    "\27\4\1\0\37\4\1\0\1\4\1\0\4\4\2\0\7\4\1\0"+
-    "\47\4\1\0\23\4\16\0\11\5\56\0\125\4\14\0\u026c\4\2\0"+
-    "\10\4\12\0\32\4\5\0\113\4\25\0\15\4\1\0\4\4\16\0"+
-    "\22\4\16\0\22\4\16\0\15\4\1\0\3\4\17\0\64\4\43\0"+
-    "\1\4\4\0\1\4\3\0\12\5\46\0\12\5\6\0\130\4\10\0"+
-    "\51\4\127\0\35\4\51\0\12\5\36\4\2\0\5\4\u038b\0\154\4"+
-    "\224\0\234\4\4\0\132\4\6\0\26\4\2\0\6\4\2\0\46\4"+
-    "\2\0\6\4\2\0\10\4\1\0\1\4\1\0\1\4\1\0\1\4"+
-    "\1\0\37\4\2\0\65\4\1\0\7\4\1\0\1\4\3\0\3\4"+
-    "\1\0\7\4\3\0\4\4\2\0\6\4\4\0\15\4\5\0\3\4"+
-    "\1\0\7\4\164\0\1\4\15\0\1\4\202\0\1\4\4\0\1\4"+
-    "\2\0\12\4\1\0\1\4\3\0\5\4\6\0\1\4\1\0\1\4"+
-    "\1\0\1\4\1\0\4\4\1\0\3\4\1\0\7\4\3\0\3\4"+
-    "\5\0\5\4\u0ebb\0\2\4\52\0\5\4\5\0\2\4\4\0\126\4"+
-    "\6\0\3\4\1\0\132\4\1\0\4\4\5\0\50\4\4\0\136\4"+
-    "\21\0\30\4\70\0\20\4\u0200\0\u19b6\4\112\0\u51a6\4\132\0\u048d\4"+
-    "\u0773\0\u2ba4\4\u215c\0\u012e\4\2\0\73\4\225\0\7\4\14\0\5\4"+
-    "\5\0\1\4\1\0\12\4\1\0\15\4\1\0\5\4\1\0\1\4"+
-    "\1\0\2\4\1\0\2\4\1\0\154\4\41\0\u016b\4\22\0\100\4"+
-    "\2\0\66\4\50\0\14\4\164\0\5\4\1\0\207\4\23\0\12\5"+
-    "\7\0\32\4\6\0\32\4\13\0\131\4\3\0\6\4\2\0\6\4"+
-    "\2\0\6\4\2\0\3\4\43\0";
+    "\11\0\1\3\1\7\1\0\1\3\23\0\1\3\1\57\1\25\1\77"+
+    "\1\10\1\67\1\65\1\23\1\72\1\73\1\13\1\62\1\76\1\21"+
+    "\1\17\1\12\1\14\11\1\1\74\1\75\1\63\1\60\1\64\1\61"+
+    "\1\11\1\2\1\16\2\2\1\20\1\2\11\4\1\22\3\4\1\54"+
+    "\3\4\1\15\2\4\1\70\1\24\1\71\1\0\1\4\1\6\1\42"+
+    "\1\46\1\35\1\56\1\40\1\52\1\44\1\32\1\33\1\47\1\43"+
+    "\1\51\1\4\1\37\1\36\1\41\1\4\1\45\1\34\1\31\1\26"+
+    "\1\55\1\50\1\15\1\53\1\4\1\27\1\66\1\30\54\0\1\4"+
+    "\12\0\1\4\4\0\1\4\5\0\27\4\1\0\37\4\1\0\u013f\4"+
+    "\31\0\162\4\4\0\14\4\16\0\5\4\11\0\1\4\213\0\1\4"+
+    "\13\0\1\4\1\0\3\4\1\0\1\4\1\0\24\4\1\0\54\4"+
+    "\1\0\46\4\1\0\5\4\4\0\202\4\10\0\105\4\1\0\46\4"+
+    "\2\0\2\4\6\0\20\4\41\0\46\4\2\0\1\4\7\0\47\4"+
+    "\110\0\33\4\5\0\3\4\56\0\32\4\5\0\13\4\25\0\12\5"+
+    "\4\0\2\4\1\0\143\4\1\0\1\4\17\0\2\4\7\0\2\4"+
+    "\12\5\3\4\2\0\1\4\20\0\1\4\1\0\36\4\35\0\3\4"+
+    "\60\0\46\4\13\0\1\4\u0152\0\66\4\3\0\1\4\22\0\1\4"+
+    "\7\0\12\4\4\0\12\5\25\0\10\4\2\0\2\4\2\0\26\4"+
+    "\1\0\7\4\1\0\1\4\3\0\4\4\3\0\1\4\36\0\2\4"+
+    "\1\0\3\4\4\0\12\5\2\4\23\0\6\4\4\0\2\4\2\0"+
+    "\26\4\1\0\7\4\1\0\2\4\1\0\2\4\1\0\2\4\37\0"+
+    "\4\4\1\0\1\4\7\0\12\5\2\0\3\4\20\0\11\4\1\0"+
+    "\3\4\1\0\26\4\1\0\7\4\1\0\2\4\1\0\5\4\3\0"+
+    "\1\4\22\0\1\4\17\0\2\4\4\0\12\5\25\0\10\4\2\0"+
+    "\2\4\2\0\26\4\1\0\7\4\1\0\2\4\1\0\5\4\3\0"+
+    "\1\4\36\0\2\4\1\0\3\4\4\0\12\5\1\0\1\4\21\0"+
+    "\1\4\1\0\6\4\3\0\3\4\1\0\4\4\3\0\2\4\1\0"+
+    "\1\4\1\0\2\4\3\0\2\4\3\0\3\4\3\0\10\4\1\0"+
+    "\3\4\55\0\11\5\25\0\10\4\1\0\3\4\1\0\27\4\1\0"+
+    "\12\4\1\0\5\4\46\0\2\4\4\0\12\5\25\0\10\4\1\0"+
+    "\3\4\1\0\27\4\1\0\12\4\1\0\5\4\3\0\1\4\40\0"+
+    "\1\4\1\0\2\4\4\0\12\5\25\0\10\4\1\0\3\4\1\0"+
+    "\27\4\1\0\20\4\46\0\2\4\4\0\12\5\25\0\22\4\3\0"+
+    "\30\4\1\0\11\4\1\0\1\4\2\0\7\4\72\0\60\4\1\0"+
+    "\2\4\14\0\7\4\11\0\12\5\47\0\2\4\1\0\1\4\2\0"+
+    "\2\4\1\0\1\4\2\0\1\4\6\0\4\4\1\0\7\4\1\0"+
+    "\3\4\1\0\1\4\1\0\1\4\2\0\2\4\1\0\4\4\1\0"+
+    "\2\4\11\0\1\4\2\0\5\4\1\0\1\4\11\0\12\5\2\0"+
+    "\2\4\42\0\1\4\37\0\12\5\26\0\10\4\1\0\42\4\35\0"+
+    "\4\4\164\0\42\4\1\0\5\4\1\0\2\4\25\0\12\5\6\0"+
+    "\6\4\112\0\46\4\12\0\51\4\7\0\132\4\5\0\104\4\5\0"+
+    "\122\4\6\0\7\4\1\0\77\4\1\0\1\4\1\0\4\4\2\0"+
+    "\7\4\1\0\1\4\1\0\4\4\2\0\47\4\1\0\1\4\1\0"+
+    "\4\4\2\0\37\4\1\0\1\4\1\0\4\4\2\0\7\4\1\0"+
+    "\1\4\1\0\4\4\2\0\7\4\1\0\7\4\1\0\27\4\1\0"+
+    "\37\4\1\0\1\4\1\0\4\4\2\0\7\4\1\0\47\4\1\0"+
+    "\23\4\16\0\11\5\56\0\125\4\14\0\u026c\4\2\0\10\4\12\0"+
+    "\32\4\5\0\113\4\25\0\15\4\1\0\4\4\16\0\22\4\16\0"+
+    "\22\4\16\0\15\4\1\0\3\4\17\0\64\4\43\0\1\4\4\0"+
+    "\1\4\3\0\12\5\46\0\12\5\6\0\130\4\10\0\51\4\127\0"+
+    "\35\4\51\0\12\5\36\4\2\0\5\4\u038b\0\154\4\224\0\234\4"+
+    "\4\0\132\4\6\0\26\4\2\0\6\4\2\0\46\4\2\0\6\4"+
+    "\2\0\10\4\1\0\1\4\1\0\1\4\1\0\1\4\1\0\37\4"+
+    "\2\0\65\4\1\0\7\4\1\0\1\4\3\0\3\4\1\0\7\4"+
+    "\3\0\4\4\2\0\6\4\4\0\15\4\5\0\3\4\1\0\7\4"+
+    "\164\0\1\4\15\0\1\4\202\0\1\4\4\0\1\4\2\0\12\4"+
+    "\1\0\1\4\3\0\5\4\6\0\1\4\1\0\1\4\1\0\1\4"+
+    "\1\0\4\4\1\0\3\4\1\0\7\4\3\0\3\4\5\0\5\4"+
+    "\u0ebb\0\2\4\52\0\5\4\5\0\2\4\4\0\126\4\6\0\3\4"+
+    "\1\0\132\4\1\0\4\4\5\0\50\4\4\0\136\4\21\0\30\4"+
+    "\70\0\20\4\u0200\0\u19b6\4\112\0\u51a6\4\132\0\u048d\4\u0773\0\u2ba4\4"+
+    "\u215c\0\u012e\4\2\0\73\4\225\0\7\4\14\0\5\4\5\0\1\4"+
+    "\1\0\12\4\1\0\15\4\1\0\5\4\1\0\1\4\1\0\2\4"+
+    "\1\0\2\4\1\0\154\4\41\0\u016b\4\22\0\100\4\2\0\66\4"+
+    "\50\0\14\4\164\0\5\4\1\0\207\4\23\0\12\5\7\0\32\4"+
+    "\6\0\32\4\13\0\131\4\3\0\6\4\2\0\6\4\2\0\6\4"+
+    "\2\0\3\4\43\0";
 
   /** 
    * Translates characters to character classes
@@ -122,26 +121,27 @@ class _JetLexer implements FlexLexer {
   private static final String ZZ_ACTION_PACKED_0 =
     "\4\0\1\1\1\2\1\3\1\4\2\1\1\5\1\6"+
     "\1\7\1\2\1\10\1\11\1\12\1\13\1\14\1\15"+
-    "\16\3\1\16\1\17\1\20\1\21\1\22\1\23\2\1"+
+    "\20\3\1\16\1\17\1\20\1\21\1\22\1\23\2\1"+
     "\1\24\1\25\1\26\1\27\1\30\1\31\1\32\1\33"+
-    "\1\34\2\35\1\36\1\0\1\37\1\40\1\0\1\41"+
-    "\1\42\1\0\1\43\1\0\1\44\1\0\1\45\1\0"+
-    "\1\46\1\47\1\50\1\51\1\52\1\43\2\2\1\43"+
-    "\1\53\1\54\1\55\1\56\2\12\1\0\2\3\1\57"+
-    "\7\3\1\60\1\61\1\62\10\3\1\63\1\64\1\65"+
-    "\1\0\1\66\1\67\1\70\1\71\1\72\1\73\1\74"+
-    "\1\75\1\76\1\77\1\100\1\0\1\101\1\102\1\0"+
-    "\1\103\1\43\1\3\2\0\1\50\1\104\4\0\1\105"+
-    "\2\3\1\106\5\3\1\107\10\3\1\110\1\111\1\3"+
-    "\1\112\1\113\1\114\1\115\1\116\1\117\1\0\1\40"+
-    "\1\44\1\45\1\0\2\104\1\43\2\0\1\3\1\120"+
-    "\1\121\3\3\1\122\1\123\1\3\1\124\2\3\1\125"+
-    "\2\3\1\126\1\100\1\50\2\0\2\3\1\127\1\3"+
-    "\1\130\1\3\1\131\1\132\1\133\1\105\2\3\1\134"+
-    "\1\135\3\3\1\136\1\137";
+    "\1\34\1\35\1\36\1\35\1\0\1\37\1\40\1\0"+
+    "\1\40\1\41\1\42\1\0\1\43\1\0\1\44\1\0"+
+    "\1\45\1\0\1\46\1\47\1\50\1\51\1\52\1\43"+
+    "\2\2\1\43\1\53\1\54\1\55\1\56\2\12\1\0"+
+    "\3\3\1\57\1\60\1\61\7\3\1\62\10\3\1\63"+
+    "\1\0\1\64\1\65\1\66\1\67\1\70\1\71\1\72"+
+    "\1\73\1\74\1\75\1\76\1\0\1\77\2\100\1\0"+
+    "\1\40\1\101\1\43\1\3\2\0\1\50\1\102\4\0"+
+    "\1\103\4\3\1\104\10\3\1\105\4\3\1\106\1\107"+
+    "\2\3\1\110\1\111\1\112\1\113\1\114\1\115\2\0"+
+    "\2\40\1\44\1\45\1\0\2\102\1\43\2\0\1\116"+
+    "\1\3\1\117\1\3\1\120\4\3\1\121\1\122\4\3"+
+    "\1\123\1\3\1\124\1\125\1\76\1\0\1\126\1\50"+
+    "\2\0\1\127\1\130\1\131\1\3\1\132\3\3\1\133"+
+    "\1\134\1\135\1\0\1\103\1\3\1\136\1\3\1\137"+
+    "\1\3\1\140\1\141";
 
   private static int [] zzUnpackAction() {
-    int [] result = new int[210];
+    int [] result = new int[224];
     int offset = 0;
     offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
     return result;
@@ -170,32 +170,33 @@ class _JetLexer implements FlexLexer {
     "\0\u0200\0\u0240\0\u0280\0\u02c0\0\u0300\0\u0340\0\u0380\0\u03c0"+
     "\0\u0400\0\u0440\0\u0100\0\u0100\0\u0480\0\u04c0\0\u0500\0\u0540"+
     "\0\u0580\0\u05c0\0\u0600\0\u0640\0\u0680\0\u06c0\0\u0700\0\u0740"+
-    "\0\u0780\0\u07c0\0\u0800\0\u0840\0\u0880\0\u08c0\0\u0900\0\u0940"+
-    "\0\u0980\0\u09c0\0\u0100\0\u0a00\0\u0100\0\u0100\0\u0100\0\u0100"+
-    "\0\u0100\0\u0100\0\u0100\0\u0a40\0\u0a80\0\u0100\0\u0ac0\0\u0100"+
-    "\0\u0b00\0\u0b40\0\u0100\0\u0100\0\u0b80\0\u0bc0\0\u0c00\0\u0c40"+
-    "\0\u0c80\0\u0cc0\0\u0d00\0\u0100\0\u0d40\0\u0d80\0\u0100\0\u0100"+
-    "\0\u0dc0\0\u0e00\0\u0e40\0\u0e80\0\u0100\0\u0100\0\u0100\0\u0100"+
-    "\0\u0100\0\u0ec0\0\u0f00\0\u0f40\0\u0f80\0\u0fc0\0\u1000\0\u1040"+
-    "\0\u1080\0\u10c0\0\u1100\0\u1140\0\u1180\0\u0180\0\u0180\0\u0180"+
-    "\0\u11c0\0\u1200\0\u1240\0\u1280\0\u12c0\0\u1300\0\u1340\0\u1380"+
-    "\0\u0180\0\u13c0\0\u0100\0\u1400\0\u1440\0\u0100\0\u0100\0\u0100"+
-    "\0\u0100\0\u0100\0\u0100\0\u0100\0\u0100\0\u0100\0\u1480\0\u14c0"+
-    "\0\u0100\0\u0100\0\u1500\0\u0100\0\u1540\0\u0100\0\u1580\0\u15c0"+
-    "\0\u1600\0\u1640\0\u1680\0\u16c0\0\u1700\0\u1740\0\u1780\0\u17c0"+
-    "\0\u1800\0\u0100\0\u1840\0\u1880\0\u18c0\0\u1900\0\u1940\0\u0180"+
-    "\0\u1980\0\u19c0\0\u1a00\0\u1a40\0\u1a80\0\u1ac0\0\u1b00\0\u1b40"+
-    "\0\u0180\0\u0180\0\u1b80\0\u0180\0\u0180\0\u0100\0\u0100\0\u0100"+
-    "\0\u0100\0\u1bc0\0\u0100\0\u0100\0\u0100\0\u1c00\0\u1c40\0\u0100"+
-    "\0\u1c80\0\u1540\0\u1cc0\0\u1d00\0\u0180\0\u0180\0\u1d40\0\u1d80"+
-    "\0\u1dc0\0\u0180\0\u0180\0\u1e00\0\u0180\0\u1e40\0\u1e80\0\u0180"+
-    "\0\u1ec0\0\u1f00\0\u0180\0\u0100\0\u0100\0\u1f40\0\u1f80\0\u1fc0"+
-    "\0\u2000\0\u0180\0\u2040\0\u0180\0\u2080\0\u0180\0\u0180\0\u0180"+
-    "\0\u0100\0\u20c0\0\u2100\0\u0180\0\u0180\0\u2140\0\u2180\0\u21c0"+
-    "\0\u0180\0\u0180";
+    "\0\u0780\0\u07c0\0\u0800\0\u0840\0\u0880\0\u08c0\0\u0100\0\u0900"+
+    "\0\u0940\0\u0980\0\u09c0\0\u0a00\0\u0a40\0\u0100\0\u0100\0\u0100"+
+    "\0\u0100\0\u0100\0\u0100\0\u0100\0\u0100\0\u0a80\0\u0100\0\u0ac0"+
+    "\0\u0b00\0\u0100\0\u0b40\0\u0b80\0\u0bc0\0\u0100\0\u0100\0\u0c00"+
+    "\0\u0c40\0\u0c80\0\u0cc0\0\u0d00\0\u0d40\0\u0d80\0\u0100\0\u0dc0"+
+    "\0\u0e00\0\u0100\0\u0100\0\u0e40\0\u0e80\0\u0ec0\0\u0f00\0\u0100"+
+    "\0\u0100\0\u0100\0\u0100\0\u0100\0\u0f40\0\u0f80\0\u0fc0\0\u1000"+
+    "\0\u1040\0\u0180\0\u0180\0\u0180\0\u1080\0\u10c0\0\u1100\0\u1140"+
+    "\0\u1180\0\u11c0\0\u1200\0\u1240\0\u1280\0\u12c0\0\u1300\0\u1340"+
+    "\0\u1380\0\u13c0\0\u1400\0\u1440\0\u0180\0\u1480\0\u14c0\0\u1500"+
+    "\0\u0100\0\u0100\0\u0100\0\u0100\0\u0100\0\u0100\0\u0100\0\u0100"+
+    "\0\u1540\0\u1580\0\u0100\0\u0100\0\u15c0\0\u1600\0\u1640\0\u0100"+
+    "\0\u1680\0\u0100\0\u16c0\0\u1700\0\u1740\0\u1780\0\u17c0\0\u1800"+
+    "\0\u1840\0\u1880\0\u18c0\0\u1900\0\u1940\0\u1980\0\u19c0\0\u0180"+
+    "\0\u1a00\0\u1a40\0\u1a80\0\u1ac0\0\u1b00\0\u1b40\0\u1b80\0\u1bc0"+
+    "\0\u0100\0\u1c00\0\u1c40\0\u1c80\0\u1cc0\0\u0180\0\u0180\0\u1d00"+
+    "\0\u1d40\0\u0180\0\u0180\0\u1d80\0\u1d80\0\u0100\0\u0100\0\u1dc0"+
+    "\0\u1e00\0\u0100\0\u1e40\0\u0100\0\u0100\0\u1e80\0\u1ec0\0\u0100"+
+    "\0\u1f00\0\u1680\0\u1f40\0\u0180\0\u1f80\0\u0180\0\u1fc0\0\u0180"+
+    "\0\u2000\0\u2040\0\u2080\0\u20c0\0\u0180\0\u0180\0\u2100\0\u2140"+
+    "\0\u2180\0\u21c0\0\u0180\0\u2200\0\u0180\0\u0100\0\u0100\0\u2240"+
+    "\0\u0b40\0\u0100\0\u2280\0\u22c0\0\u0180\0\u0180\0\u0180\0\u2300"+
+    "\0\u0180\0\u2340\0\u2380\0\u23c0\0\u0180\0\u0180\0\u0180\0\u2400"+
+    "\0\u0100\0\u2440\0\u0180\0\u2480\0\u0180\0\u24c0\0\u0180\0\u0180";
 
   private static int [] zzUnpackRowMap() {
-    int [] result = new int[210];
+    int [] result = new int[224];
     int offset = 0;
     offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
     return result;
@@ -218,207 +219,242 @@ class _JetLexer implements FlexLexer {
   private static final int [] ZZ_TRANS = zzUnpackTrans();
 
   private static final String ZZ_TRANS_PACKED_0 =
-    "\1\5\1\6\1\7\1\10\1\7\1\5\1\11\1\12"+
-    "\1\13\1\14\1\15\1\10\1\16\2\7\1\17\1\7"+
-    "\1\20\1\7\1\21\1\5\1\22\1\23\1\24\1\25"+
-    "\1\26\1\7\1\27\2\7\1\30\1\31\1\32\1\33"+
-    "\1\7\1\34\1\35\1\7\1\36\3\7\1\37\1\7"+
-    "\1\40\1\41\1\42\1\43\1\44\1\45\1\46\1\47"+
+    "\1\5\1\6\1\7\1\10\1\7\1\5\1\11\1\10"+
+    "\1\12\1\13\1\14\1\15\1\16\2\7\1\17\1\7"+
+    "\1\20\1\7\1\21\1\5\1\22\1\7\1\23\1\24"+
+    "\1\25\1\7\1\26\1\27\1\30\1\31\1\32\1\33"+
+    "\1\34\1\35\2\7\1\36\1\37\1\7\1\40\1\7"+
+    "\1\41\1\7\1\42\1\43\1\44\1\45\1\46\1\47"+
     "\1\50\1\51\1\52\1\53\1\54\1\55\1\56\1\57"+
-    "\1\60\1\61\1\62\1\63\7\64\1\65\3\64\1\66"+
-    "\10\64\1\67\1\70\52\64\2\0\1\71\1\0\1\71"+
-    "\1\0\1\72\6\0\2\71\1\0\1\71\1\0\1\71"+
-    "\5\0\27\71\21\0\1\5\1\6\1\7\1\10\1\7"+
-    "\1\5\1\11\1\12\1\13\1\14\1\15\1\10\1\16"+
-    "\2\7\1\17\1\7\1\20\1\7\1\21\1\5\1\22"+
-    "\1\73\1\74\1\25\1\26\1\7\1\27\2\7\1\30"+
-    "\1\31\1\32\1\33\1\7\1\34\1\35\1\7\1\36"+
-    "\3\7\1\37\1\7\1\40\1\41\1\42\1\43\1\44"+
-    "\1\45\1\46\1\47\1\50\1\51\1\52\1\53\1\54"+
-    "\1\55\1\56\1\57\1\60\1\61\1\62\1\63\101\0"+
-    "\1\6\12\0\1\6\2\0\1\75\1\76\12\0\1\76"+
-    "\45\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
-    "\1\0\1\7\5\0\27\7\24\0\1\10\7\0\1\10"+
-    "\66\0\1\77\1\0\1\77\10\0\2\77\1\0\1\77"+
-    "\1\0\1\77\5\0\27\77\23\0\1\100\1\0\1\100"+
-    "\1\0\1\101\6\0\2\100\1\0\1\100\1\0\1\100"+
-    "\5\0\27\100\23\0\1\102\1\0\1\102\1\0\1\103"+
-    "\1\0\1\104\4\0\2\102\1\0\1\102\1\0\1\102"+
-    "\5\0\27\102\32\0\1\105\1\106\44\0\1\107\77\0"+
-    "\1\110\21\0\1\111\12\0\1\111\1\112\1\113\1\75"+
-    "\1\76\12\0\1\76\10\0\1\113\34\0\1\114\12\0"+
-    "\1\114\2\0\1\115\101\0\1\116\35\0\1\117\4\0"+
-    "\1\120\13\0\13\21\1\0\7\21\1\121\1\122\53\21"+
-    "\25\0\1\123\53\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\5\0\1\7\1\124\10\7"+
-    "\1\125\14\7\22\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\5\0\4\7\1\126\22\7"+
-    "\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
-    "\1\0\1\7\5\0\20\7\1\127\6\7\22\0\2\7"+
+    "\1\60\1\61\1\62\1\63\1\64\1\65\7\66\1\67"+
+    "\1\70\13\66\1\71\1\72\52\66\2\0\1\73\1\0"+
+    "\1\73\1\0\1\74\6\0\2\73\1\0\1\73\1\0"+
+    "\1\73\3\0\1\73\2\0\1\75\25\73\21\0\1\5"+
+    "\1\6\1\7\1\10\1\7\1\5\1\11\1\10\1\12"+
+    "\1\13\1\14\1\15\1\16\2\7\1\17\1\7\1\20"+
+    "\1\7\1\21\1\5\1\22\1\7\1\76\1\77\1\25"+
+    "\1\7\1\26\1\27\1\30\1\31\1\32\1\33\1\34"+
+    "\1\35\2\7\1\36\1\37\1\7\1\40\1\7\1\41"+
+    "\1\7\1\42\1\43\1\44\1\45\1\46\1\47\1\50"+
+    "\1\51\1\52\1\53\1\54\1\55\1\56\1\57\1\60"+
+    "\1\61\1\62\1\63\1\64\1\65\101\0\1\6\12\0"+
+    "\1\6\2\0\1\100\1\101\17\0\1\101\40\0\2\7"+
     "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
-    "\5\0\7\7\1\130\10\7\1\131\6\7\22\0\2\7"+
+    "\3\0\1\7\2\0\26\7\24\0\1\10\3\0\1\10"+
+    "\70\0\6\102\2\0\70\102\2\0\1\103\1\0\1\103"+
+    "\1\0\1\104\6\0\2\103\1\0\1\103\1\0\1\103"+
+    "\3\0\1\103\2\0\26\103\23\0\1\105\1\0\1\105"+
+    "\1\0\1\106\2\0\1\107\3\0\2\105\1\0\1\105"+
+    "\1\0\1\105\3\0\1\105\2\0\26\105\33\0\1\110"+
+    "\1\111\44\0\1\112\77\0\1\113\20\0\1\114\12\0"+
+    "\1\114\1\115\1\116\1\100\1\101\17\0\1\101\5\0"+
+    "\1\116\32\0\1\117\12\0\1\117\2\0\1\120\101\0"+
+    "\1\121\36\0\1\122\3\0\1\123\13\0\7\21\1\0"+
+    "\13\21\1\124\1\125\53\21\25\0\1\126\53\0\2\7"+
     "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
-    "\5\0\14\7\1\132\12\7\22\0\2\7\1\0\2\7"+
-    "\6\0\3\7\1\0\1\7\1\0\1\7\5\0\13\7"+
-    "\1\133\3\7\1\134\3\7\1\135\3\7\22\0\2\7"+
+    "\3\0\1\7\2\0\1\7\1\127\12\7\1\130\5\7"+
+    "\1\131\3\7\22\0\2\7\1\0\2\7\6\0\3\7"+
+    "\1\0\1\7\1\0\1\7\3\0\1\7\2\0\3\7"+
+    "\1\132\2\7\1\133\12\7\1\134\4\7\22\0\2\7"+
     "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
-    "\5\0\1\136\3\7\1\137\15\7\1\140\4\7\22\0"+
+    "\3\0\1\135\2\0\26\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\5\7\1\136\12\7\1\137\5\7\22\0\2\7"+
+    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
+    "\3\0\1\7\2\0\15\7\1\140\10\7\22\0\2\7"+
+    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
+    "\3\0\1\141\2\0\26\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\20\7\1\142\5\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\11\7\1\143\14\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\3\7\1\144\22\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\7\7\1\145\16\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\14\7\1\146\11\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\1\7\1\147\24\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\150"+
+    "\2\0\5\7\1\151\3\7\1\152\14\7\22\0\2\7"+
+    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
+    "\3\0\1\7\2\0\1\7\1\153\24\7\22\0\2\7"+
+    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
+    "\3\0\1\7\2\0\11\7\1\154\14\7\22\0\2\7"+
+    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
+    "\3\0\1\7\2\0\5\7\1\155\20\7\54\0\1\156"+
+    "\24\0\1\157\77\0\1\160\3\0\1\161\73\0\1\162"+
+    "\1\0\1\163\75\0\1\164\77\0\1\165\104\0\1\166"+
+    "\100\0\1\167\71\0\1\170\17\0\7\66\2\0\13\66"+
+    "\2\0\52\66\2\0\1\171\1\0\1\171\1\0\1\172"+
+    "\6\0\2\171\1\0\1\171\1\0\1\171\3\0\1\171"+
+    "\1\173\1\0\26\171\21\0\7\174\1\0\16\174\1\175"+
+    "\51\174\1\0\2\73\1\0\2\73\6\0\3\73\1\0"+
+    "\1\73\1\0\1\73\3\0\1\73\2\0\26\73\21\0"+
+    "\6\176\2\0\70\176\1\0\2\73\1\0\2\73\6\0"+
+    "\3\73\1\0\1\73\1\0\1\73\3\0\1\73\2\0"+
+    "\1\73\1\177\24\73\22\0\1\117\12\0\1\117\2\0"+
+    "\1\200\61\0\1\201\12\0\1\201\4\0\1\201\40\0"+
+    "\1\201\15\0\6\102\1\202\1\0\70\102\1\0\2\103"+
+    "\1\0\2\103\6\0\3\103\1\0\1\103\1\0\1\103"+
+    "\3\0\1\103\2\0\26\103\21\0\6\203\2\0\70\203"+
+    "\1\0\2\105\1\0\2\105\6\0\3\105\1\0\1\105"+
+    "\1\0\1\105\3\0\1\105\2\0\26\105\21\0\6\204"+
+    "\2\0\70\204\7\110\1\0\70\110\13\205\1\206\64\205"+
+    "\1\0\1\114\12\0\1\114\2\0\1\207\1\101\17\0"+
+    "\1\101\40\0\2\115\11\0\1\115\1\0\1\115\1\210"+
+    "\1\115\1\0\1\211\12\0\1\115\2\0\1\115\1\211"+
+    "\1\115\3\0\1\115\3\0\1\115\3\0\1\115\22\0"+
+    "\1\116\12\0\1\116\2\0\1\212\61\0\1\117\12\0"+
+    "\1\117\3\0\1\101\17\0\1\101\37\0\7\21\1\0"+
+    "\70\21\25\0\1\213\53\0\2\7\1\0\2\7\6\0"+
+    "\3\7\1\0\1\7\1\0\1\7\3\0\1\7\2\0"+
+    "\2\7\1\214\11\7\1\215\11\7\22\0\2\7\1\0"+
+    "\2\7\6\0\3\7\1\0\1\7\1\0\1\7\3\0"+
+    "\1\216\2\0\11\7\1\217\10\7\1\220\3\7\22\0"+
     "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
-    "\1\7\5\0\3\7\1\141\23\7\22\0\2\7\1\0"+
-    "\2\7\6\0\3\7\1\0\1\7\1\0\1\7\5\0"+
-    "\13\7\1\142\13\7\22\0\2\7\1\0\2\7\6\0"+
-    "\3\7\1\0\1\7\1\0\1\7\5\0\17\7\1\143"+
-    "\7\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\5\0\1\7\1\144\5\7\1\145"+
-    "\2\7\1\146\14\7\22\0\2\7\1\0\2\7\6\0"+
-    "\3\7\1\0\1\7\1\0\1\7\5\0\17\7\1\147"+
-    "\7\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\5\0\1\7\1\150\25\7\22\0"+
+    "\1\7\3\0\1\7\2\0\10\7\1\221\15\7\22\0"+
     "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
-    "\1\7\5\0\7\7\1\151\17\7\100\0\1\152\4\0"+
-    "\1\153\54\0\1\154\15\0\1\155\37\0\1\156\47\0"+
-    "\1\157\67\0\1\160\2\0\1\161\74\0\1\162\77\0"+
-    "\1\163\105\0\1\164\100\0\1\165\70\0\1\166\20\0"+
-    "\7\64\1\0\3\64\1\0\10\64\2\0\52\64\2\0"+
-    "\1\167\1\0\1\167\1\0\1\170\6\0\2\167\1\0"+
-    "\1\167\1\0\1\167\3\0\1\171\1\0\27\167\21\0"+
-    "\13\172\1\0\64\172\1\0\2\71\1\0\2\71\6\0"+
-    "\3\71\1\0\1\71\1\0\1\71\5\0\27\71\23\0"+
-    "\1\173\1\0\1\173\10\0\2\173\1\0\1\173\1\0"+
-    "\1\173\5\0\27\173\22\0\1\114\12\0\1\114\2\0"+
-    "\1\174\61\0\1\175\12\0\1\175\4\0\1\175\40\0"+
-    "\1\175\16\0\2\77\1\0\2\77\1\176\5\0\3\77"+
-    "\1\0\1\77\1\0\1\77\5\0\27\77\22\0\2\100"+
-    "\1\0\2\100\6\0\3\100\1\0\1\100\1\0\1\100"+
-    "\5\0\27\100\23\0\1\177\1\0\1\177\10\0\2\177"+
-    "\1\0\1\177\1\0\1\177\5\0\27\177\22\0\2\102"+
-    "\1\0\2\102\6\0\3\102\1\0\1\102\1\0\1\102"+
-    "\5\0\27\102\23\0\1\200\1\0\1\200\10\0\2\200"+
-    "\1\0\1\200\1\0\1\200\5\0\27\200\21\0\13\105"+
-    "\1\0\64\105\12\201\1\202\65\201\1\0\1\111\12\0"+
-    "\1\111\2\0\1\203\1\76\12\0\1\76\45\0\2\112"+
-    "\11\0\1\112\1\0\1\112\1\204\1\112\1\0\1\205"+
-    "\6\0\1\112\1\0\1\112\1\0\1\205\1\112\5\0"+
-    "\1\112\5\0\1\112\3\0\1\112\22\0\1\113\12\0"+
-    "\1\113\2\0\1\206\61\0\1\114\12\0\1\114\3\0"+
-    "\1\76\12\0\1\76\44\0\13\21\1\0\64\21\25\0"+
-    "\1\207\53\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\5\0\2\7\1\210\24\7\22\0"+
+    "\1\7\3\0\1\7\2\0\10\7\1\222\15\7\22\0"+
     "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
-    "\1\7\5\0\20\7\1\211\6\7\22\0\2\7\1\0"+
-    "\2\7\6\0\3\7\1\0\1\7\1\0\1\7\5\0"+
-    "\27\7\2\0\1\212\17\0\2\7\1\0\2\7\6\0"+
-    "\3\7\1\0\1\7\1\0\1\7\5\0\4\7\1\213"+
-    "\22\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\5\0\1\214\26\7\22\0\2\7"+
+    "\1\7\3\0\1\7\2\0\6\7\1\223\17\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\11\7\1\224\14\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\16\7\1\225\7\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\20\7\1\226\5\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\3\7\1\227\22\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\4\7\1\230\21\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\26\7\2\0\1\231\17\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\1\232\25\7\22\0\2\7"+
     "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
-    "\5\0\1\7\1\215\25\7\22\0\2\7\1\0\2\7"+
-    "\6\0\3\7\1\0\1\7\1\0\1\7\5\0\15\7"+
-    "\1\216\11\7\22\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\5\0\12\7\1\217\10\7"+
-    "\1\220\3\7\22\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\5\0\11\7\1\221\1\7"+
-    "\1\222\13\7\22\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\5\0\5\7\1\223\21\7"+
-    "\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
-    "\1\0\1\7\5\0\10\7\1\224\16\7\22\0\2\7"+
+    "\3\0\1\7\2\0\7\7\1\233\16\7\22\0\2\7"+
     "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
-    "\5\0\3\7\1\225\23\7\22\0\2\7\1\0\2\7"+
-    "\6\0\3\7\1\0\1\7\1\0\1\7\5\0\3\7"+
-    "\1\226\5\7\1\227\15\7\22\0\2\7\1\0\2\7"+
-    "\6\0\3\7\1\0\1\7\1\0\1\7\5\0\20\7"+
-    "\1\230\6\7\22\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\5\0\13\7\1\231\13\7"+
+    "\3\0\1\7\2\0\2\7\1\234\4\7\1\235\16\7"+
     "\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
-    "\1\0\1\7\5\0\1\232\26\7\22\0\2\7\1\0"+
-    "\2\7\6\0\3\7\1\0\1\7\1\0\1\7\5\0"+
-    "\11\7\1\233\15\7\22\0\2\7\1\0\2\7\6\0"+
-    "\3\7\1\0\1\7\1\0\1\7\5\0\13\7\1\234"+
-    "\4\7\1\235\6\7\100\0\1\236\50\0\1\237\3\0"+
-    "\1\240\122\0\1\241\21\0\2\167\1\0\2\167\6\0"+
-    "\3\167\1\0\1\167\1\0\1\167\5\0\27\167\23\0"+
-    "\1\242\1\0\1\242\10\0\2\242\1\0\1\242\1\0"+
-    "\1\242\5\0\27\242\22\0\2\173\1\0\2\173\1\243"+
-    "\5\0\3\173\1\0\1\173\1\0\1\173\5\0\27\173"+
-    "\22\0\1\175\12\0\1\175\64\0\2\177\1\0\2\177"+
-    "\1\244\5\0\3\177\1\0\1\177\1\0\1\177\5\0"+
-    "\27\177\22\0\2\200\1\0\2\200\1\245\5\0\3\200"+
-    "\1\0\1\200\1\0\1\200\5\0\27\200\21\0\12\201"+
-    "\1\246\65\201\11\247\1\250\1\202\65\247\1\0\1\114"+
-    "\12\0\1\114\64\0\2\251\11\0\1\251\1\0\1\251"+
-    "\1\174\1\251\10\0\1\251\1\0\1\251\2\0\1\251"+
-    "\5\0\1\251\5\0\1\251\3\0\1\251\22\0\1\175"+
-    "\12\0\1\175\4\0\1\252\40\0\1\252\34\0\1\174"+
-    "\60\0\25\207\1\253\52\207\1\0\2\7\1\0\2\7"+
-    "\6\0\3\7\1\0\1\7\1\0\1\7\5\0\3\7"+
-    "\1\254\23\7\22\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\5\0\20\7\1\255\6\7"+
+    "\1\0\1\7\3\0\1\7\2\0\6\7\1\236\17\7"+
     "\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
-    "\1\0\1\7\5\0\3\7\1\256\23\7\22\0\2\7"+
+    "\1\0\1\7\3\0\1\7\2\0\14\7\1\237\11\7"+
+    "\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
+    "\1\0\1\7\3\0\1\7\2\0\20\7\1\240\5\7"+
+    "\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
+    "\1\0\1\7\3\0\1\7\2\0\2\7\1\241\23\7"+
+    "\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
+    "\1\0\1\7\3\0\1\7\2\0\14\7\1\242\3\7"+
+    "\1\243\5\7\55\0\1\244\2\0\1\245\120\0\1\246"+
+    "\77\0\1\247\20\0\2\171\1\0\2\171\6\0\3\171"+
+    "\1\0\1\171\1\0\1\171\3\0\1\171\2\0\26\171"+
+    "\21\0\6\250\2\0\70\250\1\0\2\251\11\0\1\251"+
+    "\1\0\1\251\1\0\1\251\14\0\1\251\2\0\1\251"+
+    "\1\0\1\251\3\0\1\251\3\0\1\251\3\0\1\251"+
+    "\21\0\6\176\1\252\1\0\70\176\1\0\2\73\1\0"+
+    "\2\73\6\0\3\73\1\0\1\73\1\0\1\73\3\0"+
+    "\1\73\2\0\2\73\1\253\23\73\22\0\1\201\12\0"+
+    "\1\201\63\0\6\203\1\254\1\0\70\203\6\204\1\255"+
+    "\1\0\70\204\13\205\1\256\64\205\12\257\1\260\1\206"+
+    "\64\257\1\0\1\117\12\0\1\117\64\0\2\261\11\0"+
+    "\1\261\1\0\1\261\1\200\1\261\14\0\1\261\2\0"+
+    "\1\261\1\0\1\261\3\0\1\261\3\0\1\261\3\0"+
+    "\1\261\22\0\1\201\12\0\1\201\4\0\1\262\40\0"+
+    "\1\262\34\0\1\200\60\0\25\213\1\263\52\213\1\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\3\7\1\264\22\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\5\7\1\265\20\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\7\7\1\266\16\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\2\7\1\267\23\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\7\7\1\270\16\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\7\7\1\271\16\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\1\272\25\7\22\0\2\7"+
     "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
-    "\5\0\10\7\1\257\16\7\22\0\2\7\1\0\2\7"+
-    "\6\0\3\7\1\0\1\7\1\0\1\7\5\0\4\7"+
-    "\1\260\22\7\22\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\5\0\3\7\1\261\23\7"+
-    "\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
-    "\1\0\1\7\5\0\3\7\1\262\23\7\22\0\2\7"+
+    "\3\0\1\7\2\0\3\7\1\273\22\7\22\0\2\7"+
     "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
-    "\5\0\4\7\1\263\22\7\22\0\2\7\1\0\2\7"+
-    "\6\0\3\7\1\0\1\7\1\0\1\7\5\0\7\7"+
-    "\1\264\17\7\22\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\5\0\3\7\1\265\23\7"+
-    "\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
-    "\1\0\1\7\5\0\12\7\1\266\14\7\22\0\2\7"+
+    "\3\0\1\7\2\0\7\7\1\274\16\7\22\0\2\7"+
     "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
-    "\5\0\1\7\1\267\25\7\22\0\2\7\1\0\2\7"+
-    "\6\0\3\7\1\0\1\7\1\0\1\7\5\0\1\270"+
+    "\3\0\1\7\2\0\20\7\1\275\5\7\22\0\2\7"+
+    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
+    "\3\0\1\7\2\0\7\7\1\276\16\7\22\0\2\7"+
+    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
+    "\3\0\1\7\2\0\12\7\1\277\13\7\22\0\2\7"+
+    "\1\0\2\7\6\0\3\7\1\0\1\7\1\0\1\7"+
+    "\3\0\1\300\2\0\26\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\11\7\1\301\14\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\20\7\1\302\5\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\6\7\1\303\17\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\3\7\1\304\22\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\3\7\1\305\22\7\22\0\2\306\1\0\2\306"+
+    "\6\0\3\306\1\0\1\306\1\0\1\306\3\0\1\306"+
+    "\2\0\26\306\21\0\6\250\1\307\1\0\70\250\1\0"+
+    "\2\310\11\0\1\310\1\0\1\310\1\0\1\310\14\0"+
+    "\1\310\2\0\1\310\1\0\1\310\3\0\1\310\3\0"+
+    "\1\310\3\0\1\310\22\0\2\73\1\0\2\73\6\0"+
+    "\3\73\1\0\1\73\1\0\1\73\3\0\1\73\2\0"+
+    "\3\73\1\311\22\73\21\0\12\205\1\312\1\256\64\205"+
+    "\13\257\1\313\64\257\1\0\2\261\11\0\1\261\1\0"+
+    "\1\261\1\0\1\261\1\0\1\211\12\0\1\261\2\0"+
+    "\1\261\1\211\1\261\3\0\1\261\3\0\1\261\3\0"+
+    "\1\261\21\0\25\213\1\314\52\213\1\0\2\7\1\0"+
+    "\2\7\6\0\3\7\1\0\1\7\1\0\1\7\3\0"+
+    "\1\7\2\0\17\7\1\315\6\7\22\0\2\7\1\0"+
+    "\2\7\6\0\3\7\1\0\1\7\1\0\1\7\3\0"+
+    "\1\7\2\0\1\316\25\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\14\7\1\317\11\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\2\7\1\320\23\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\3\7\1\321\22\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\4\7\1\322\21\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\11\7\1\323\14\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\14\7\1\324\11\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\12\7\1\325\13\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\7\7\1\326\16\7\22\0\2\7\1\0\2\7"+
+    "\6\0\3\7\1\0\1\7\1\0\1\7\3\0\1\7"+
+    "\2\0\7\7\1\327\16\7\22\0\2\330\11\0\1\330"+
+    "\1\0\1\330\1\0\1\330\14\0\1\330\2\0\1\330"+
+    "\1\0\1\330\3\0\1\330\3\0\1\330\3\0\1\330"+
+    "\21\0\12\257\1\260\1\313\64\257\25\213\1\331\52\213"+
+    "\1\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
+    "\1\0\1\7\3\0\1\7\2\0\6\7\1\332\17\7"+
+    "\22\0\2\7\1\0\2\7\6\0\3\7\1\0\1\7"+
+    "\1\0\1\7\3\0\1\7\2\0\1\333\25\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\13\7\1\334\12\7\22\0"+
+    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
+    "\1\7\3\0\1\7\2\0\6\7\1\335\17\7\22\0"+
+    "\2\174\11\0\1\174\1\0\1\174\1\0\1\174\14\0"+
+    "\1\174\2\0\1\174\1\0\1\174\3\0\1\174\3\0"+
+    "\1\174\3\0\1\174\22\0\2\7\1\0\2\7\6\0"+
+    "\3\7\1\0\1\7\1\0\1\7\3\0\1\336\2\0"+
     "\26\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\5\0\20\7\1\271\6\7\22\0"+
-    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
-    "\1\7\5\0\4\7\1\272\22\7\22\0\2\7\1\0"+
-    "\2\7\6\0\3\7\1\0\1\7\1\0\1\7\5\0"+
-    "\4\7\1\273\22\7\22\0\2\242\1\0\2\242\1\274"+
-    "\5\0\3\242\1\0\1\242\1\0\1\242\5\0\27\242"+
-    "\21\0\11\201\1\275\1\246\65\201\12\247\1\276\65\247"+
-    "\1\0\2\251\11\0\1\251\1\0\1\251\1\0\1\251"+
-    "\1\0\1\205\6\0\1\251\1\0\1\251\1\0\1\205"+
-    "\1\251\5\0\1\251\5\0\1\251\3\0\1\251\21\0"+
-    "\25\207\1\277\52\207\1\0\2\7\1\0\2\7\6\0"+
-    "\3\7\1\0\1\7\1\0\1\7\5\0\4\7\1\300"+
-    "\22\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\5\0\11\7\1\301\15\7\22\0"+
-    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
-    "\1\7\5\0\4\7\1\302\22\7\22\0\2\7\1\0"+
-    "\2\7\6\0\3\7\1\0\1\7\1\0\1\7\5\0"+
-    "\6\7\1\303\20\7\22\0\2\7\1\0\2\7\6\0"+
-    "\3\7\1\0\1\7\1\0\1\7\5\0\16\7\1\304"+
-    "\10\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\5\0\13\7\1\305\13\7\22\0"+
-    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
-    "\1\7\5\0\21\7\1\306\5\7\22\0\2\7\1\0"+
-    "\2\7\6\0\3\7\1\0\1\7\1\0\1\7\5\0"+
-    "\3\7\1\307\23\7\22\0\2\7\1\0\2\7\6\0"+
-    "\3\7\1\0\1\7\1\0\1\7\5\0\3\7\1\310"+
-    "\23\7\21\0\11\247\1\250\1\276\65\247\25\207\1\311"+
-    "\52\207\1\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\5\0\5\7\1\312\21\7\22\0"+
-    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
-    "\1\7\5\0\1\313\26\7\22\0\2\7\1\0\2\7"+
-    "\6\0\3\7\1\0\1\7\1\0\1\7\5\0\10\7"+
-    "\1\314\16\7\22\0\2\7\1\0\2\7\6\0\3\7"+
-    "\1\0\1\7\1\0\1\7\5\0\1\315\26\7\22\0"+
-    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
-    "\1\7\5\0\1\7\1\316\25\7\22\0\2\7\1\0"+
-    "\2\7\6\0\3\7\1\0\1\7\1\0\1\7\5\0"+
-    "\12\7\1\317\14\7\22\0\2\7\1\0\2\7\6\0"+
-    "\3\7\1\0\1\7\1\0\1\7\5\0\6\7\1\320"+
-    "\20\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
-    "\1\7\1\0\1\7\5\0\3\7\1\321\23\7\22\0"+
-    "\2\7\1\0\2\7\6\0\3\7\1\0\1\7\1\0"+
-    "\1\7\5\0\3\7\1\322\23\7\21\0";
+    "\1\7\1\0\1\7\3\0\1\7\2\0\7\7\1\337"+
+    "\16\7\22\0\2\7\1\0\2\7\6\0\3\7\1\0"+
+    "\1\7\1\0\1\7\3\0\1\7\2\0\7\7\1\340"+
+    "\16\7\21\0";
 
   private static int [] zzUnpackTrans() {
-    int [] result = new int[8704];
+    int [] result = new int[9472];
     int offset = 0;
     offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
     return result;
@@ -459,17 +495,18 @@ class _JetLexer implements FlexLexer {
   private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
 
   private static final String ZZ_ATTRIBUTE_PACKED_0 =
-    "\4\0\1\11\15\1\2\11\26\1\1\11\1\1\7\11"+
-    "\2\1\1\11\1\0\1\11\1\1\1\0\2\11\1\0"+
-    "\1\1\1\0\1\1\1\0\1\1\1\0\1\11\2\1"+
-    "\2\11\4\1\5\11\1\1\1\0\27\1\1\11\1\0"+
-    "\1\1\11\11\1\1\1\0\2\11\1\0\1\11\1\1"+
-    "\1\11\2\0\2\1\4\0\3\1\1\11\23\1\4\11"+
-    "\1\0\3\11\1\0\1\1\1\11\1\1\2\0\20\1"+
-    "\2\11\2\0\11\1\1\11\11\1";
+    "\4\0\1\11\15\1\2\11\22\1\1\11\6\1\10\11"+
+    "\1\1\1\11\1\1\1\0\1\11\1\1\1\0\1\1"+
+    "\2\11\1\0\1\1\1\0\1\1\1\0\1\1\1\0"+
+    "\1\11\2\1\2\11\4\1\5\11\1\1\1\0\27\1"+
+    "\1\0\2\1\10\11\1\1\1\0\2\11\1\1\1\0"+
+    "\1\1\1\11\1\1\1\11\2\0\2\1\4\0\16\1"+
+    "\1\11\14\1\2\11\2\0\1\11\1\1\2\11\1\0"+
+    "\1\1\1\11\1\1\2\0\22\1\2\11\1\0\1\1"+
+    "\1\11\2\0\13\1\1\0\1\11\7\1";
 
   private static int [] zzUnpackAttribute() {
-    int [] result = new int[210];
+    int [] result = new int[224];
     int offset = 0;
     offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
     return result;
@@ -578,7 +615,7 @@ class _JetLexer implements FlexLexer {
     char [] map = new char[0x10000];
     int i = 0;  /* index in packed string  */
     int j = 0;  /* index in unpacked array */
-    while (i < 1330) {
+    while (i < 1326) {
       int  count = packed.charAt(i++);
       char value = packed.charAt(i++);
       do map[j++] = value; while (--count > 0);
@@ -803,23 +840,23 @@ class _JetLexer implements FlexLexer {
         case 3: 
           { return JetTokens.IDENTIFIER;
           }
-        case 96: break;
+        case 98: break;
         case 11: 
           { pushState(STRING); return JetTokens.OPEN_QUOTE;
           }
-        case 97: break;
-        case 72: 
+        case 99: break;
+        case 71: 
           { return JetTokens.FOR_KEYWORD ;
           }
-        case 98: break;
-        case 93: 
+        case 100: break;
+        case 95: 
           { return JetTokens.RETURN_KEYWORD ;
           }
-        case 99: break;
-        case 80: 
+        case 101: break;
+        case 81: 
           { return JetTokens.NULL_KEYWORD ;
           }
-        case 100: break;
+        case 102: break;
         case 34: 
           { if (lBraceCount == 0) {
                                              popState();
@@ -828,365 +865,373 @@ class _JetLexer implements FlexLexer {
                                            lBraceCount--;
                                            return JetTokens.RBRACE;
           }
-        case 101: break;
+        case 103: break;
         case 18: 
           { return JetTokens.LT        ;
           }
-        case 102: break;
+        case 104: break;
         case 51: 
           { return JetTokens.DO_KEYWORD ;
           }
-        case 103: break;
+        case 105: break;
         case 17: 
           { return JetTokens.PLUS      ;
           }
-        case 104: break;
-        case 69: 
+        case 106: break;
+        case 67: 
           { return JetTokens.RAW_STRING_LITERAL;
           }
-        case 105: break;
-        case 57: 
+        case 107: break;
+        case 55: 
           { return JetTokens.PLUSEQ    ;
           }
-        case 106: break;
+        case 108: break;
+        case 86: 
+          { popState(); return JetTokens.THIS_KEYWORD;
+          }
+        case 109: break;
         case 27: 
           { return JetTokens.COMMA     ;
           }
-        case 107: break;
+        case 110: break;
         case 19: 
           { return JetTokens.GT        ;
           }
-        case 108: break;
+        case 111: break;
         case 4: 
           { return JetTokens.WHITE_SPACE;
           }
-        case 109: break;
-        case 25: 
+        case 112: break;
+        case 24: 
           { return JetTokens.RPAR      ;
           }
-        case 110: break;
-        case 53: 
+        case 113: break;
+        case 54: 
           { return JetTokens.DOUBLE_ARROW;
           }
-        case 111: break;
-        case 82: 
+        case 114: break;
+        case 79: 
           { return JetTokens.TRUE_KEYWORD ;
           }
-        case 112: break;
+        case 115: break;
         case 36: 
           { return JetTokens.FIELD_IDENTIFIER;
           }
-        case 113: break;
-        case 61: 
+        case 116: break;
+        case 59: 
           { return JetTokens.ANDAND    ;
           }
-        case 114: break;
-        case 65: 
+        case 117: break;
+        case 63: 
           { pushState(LONG_TEMPLATE_ENTRY); return JetTokens.LONG_TEMPLATE_ENTRY_START;
           }
-        case 115: break;
-        case 68: 
+        case 118: break;
+        case 66: 
           { return JetTokens.DOC_COMMENT;
           }
-        case 116: break;
+        case 119: break;
         case 35: 
           { return JetTokens.FLOAT_LITERAL;
           }
-        case 117: break;
+        case 120: break;
         case 39: 
           { return JetTokens.EOL_COMMENT;
           }
-        case 118: break;
-        case 85: 
+        case 121: break;
+        case 83: 
           { return JetTokens.WHEN_KEYWORD ;
           }
-        case 119: break;
-        case 20: 
+        case 122: break;
+        case 25: 
           { return JetTokens.COLON     ;
           }
-        case 120: break;
-        case 59: 
+        case 123: break;
+        case 57: 
           { return JetTokens.LTEQ      ;
           }
-        case 121: break;
+        case 124: break;
         case 46: 
           { return JetTokens.ARROW     ;
           }
-        case 122: break;
+        case 125: break;
         case 32: 
           { popState(); return JetTokens.IDENTIFIER;
           }
-        case 123: break;
-        case 22: 
+        case 126: break;
+        case 21: 
           { return JetTokens.LBRACKET  ;
           }
-        case 124: break;
-        case 67: 
+        case 127: break;
+        case 65: 
           { yypushback(2); return JetTokens.INTEGER_LITERAL;
           }
-        case 125: break;
+        case 128: break;
         case 10: 
           { return JetTokens.CHARACTER_LITERAL;
           }
-        case 126: break;
-        case 74: 
+        case 129: break;
+        case 72: 
           { return JetTokens.VAR_KEYWORD ;
           }
-        case 127: break;
-        case 60: 
+        case 130: break;
+        case 58: 
           { return JetTokens.GTEQ      ;
           }
-        case 128: break;
+        case 131: break;
         case 2: 
           { return JetTokens.INTEGER_LITERAL;
           }
-        case 129: break;
+        case 132: break;
         case 13: 
           { return JetTokens.RBRACE    ;
           }
-        case 130: break;
-        case 87: 
+        case 133: break;
+        case 90: 
           { return JetTokens.CLASS_KEYWORD ;
           }
-        case 131: break;
-        case 15: 
+        case 134: break;
+        case 14: 
           { return JetTokens.EXCL      ;
           }
-        case 132: break;
-        case 71: 
+        case 135: break;
+        case 68: 
           { return JetTokens.TRY_KEYWORD ;
           }
-        case 133: break;
-        case 54: 
+        case 136: break;
+        case 52: 
           { return JetTokens.EXCLEQ    ;
           }
-        case 134: break;
+        case 137: break;
         case 45: 
           { return JetTokens.MINUSEQ   ;
           }
-        case 135: break;
-        case 88: 
+        case 138: break;
+        case 87: 
           { return JetTokens.THROW_KEYWORD ;
           }
-        case 136: break;
-        case 90: 
+        case 139: break;
+        case 89: 
+          { return JetTokens.SUPER_KEYWORD ;
+          }
+        case 140: break;
+        case 92: 
           { return JetTokens.WHILE_KEYWORD ;
           }
-        case 137: break;
+        case 141: break;
         case 44: 
           { return JetTokens.MINUSMINUS;
           }
-        case 138: break;
-        case 94: 
+        case 142: break;
+        case 97: 
           { return JetTokens.CONTINUE_KEYWORD ;
           }
-        case 139: break;
-        case 77: 
+        case 143: break;
+        case 75: 
           { return JetTokens.NOT_IN;
           }
-        case 140: break;
+        case 144: break;
         case 38: 
           { return JetTokens.ATAT      ;
           }
-        case 141: break;
+        case 145: break;
         case 6: 
           { return JetTokens.DIV       ;
           }
-        case 142: break;
-        case 56: 
-          { return JetTokens.ELVIS     ;
-          }
-        case 143: break;
+        case 146: break;
         case 37: 
           { return JetTokens.LABEL_IDENTIFIER;
           }
-        case 144: break;
+        case 147: break;
         case 29: 
           { return JetTokens.REGULAR_STRING_PART;
           }
-        case 145: break;
+        case 148: break;
         case 16: 
           { return JetTokens.QUEST     ;
           }
-        case 146: break;
-        case 62: 
+        case 149: break;
+        case 60: 
           { return JetTokens.OROR      ;
           }
-        case 147: break;
-        case 21: 
+        case 150: break;
+        case 20: 
           { return JetTokens.PERC      ;
           }
-        case 148: break;
-        case 79: 
+        case 151: break;
+        case 76: 
           { return JetTokens.EXCLEQEQEQ;
           }
-        case 149: break;
-        case 63: 
+        case 152: break;
+        case 61: 
           { return JetTokens.PERCEQ    ;
           }
-        case 150: break;
+        case 153: break;
         case 43: 
           { return JetTokens.RANGE     ;
           }
-        case 151: break;
+        case 154: break;
         case 1: 
           { return TokenType.BAD_CHARACTER;
           }
-        case 152: break;
-        case 55: 
-          { return JetTokens.SAFE_ACCESS;
-          }
-        case 153: break;
-        case 95: 
+        case 155: break;
+        case 96: 
           { return JetTokens.NAMESPACE_KEYWORD ;
           }
-        case 154: break;
-        case 78: 
+        case 156: break;
+        case 74: 
           { return JetTokens.NOT_IS;
           }
-        case 155: break;
+        case 157: break;
         case 7: 
           { return JetTokens.MUL       ;
           }
-        case 156: break;
-        case 23: 
+        case 158: break;
+        case 22: 
           { return JetTokens.RBRACKET  ;
           }
-        case 157: break;
-        case 58: 
+        case 159: break;
+        case 56: 
           { return JetTokens.PLUSPLUS  ;
           }
-        case 158: break;
-        case 83: 
+        case 160: break;
+        case 78: 
           { return JetTokens.THIS_KEYWORD ;
           }
-        case 159: break;
+        case 161: break;
         case 8: 
           { return JetTokens.DOT       ;
           }
-        case 160: break;
+        case 162: break;
         case 26: 
           { return JetTokens.SEMICOLON ;
           }
-        case 161: break;
-        case 50: 
+        case 163: break;
+        case 49: 
           { return JetTokens.IF_KEYWORD ;
           }
-        case 162: break;
-        case 66: 
+        case 164: break;
+        case 64: 
           { return JetTokens.ESCAPE_SEQUENCE;
           }
-        case 163: break;
+        case 165: break;
         case 31: 
           { popState(); return JetTokens.CLOSING_QUOTE;
           }
-        case 164: break;
-        case 14: 
+        case 166: break;
+        case 15: 
           { return JetTokens.EQ        ;
           }
-        case 165: break;
+        case 167: break;
         case 5: 
           { return JetTokens.AT        ;
           }
-        case 166: break;
-        case 70: 
+        case 168: break;
+        case 69: 
           { return JetTokens.AS_SAFE;
           }
-        case 167: break;
-        case 24: 
+        case 169: break;
+        case 23: 
           { return JetTokens.LPAR      ;
           }
-        case 168: break;
+        case 170: break;
         case 9: 
           { return JetTokens.MINUS     ;
           }
-        case 169: break;
-        case 91: 
+        case 171: break;
+        case 93: 
           { return JetTokens.FALSE_KEYWORD ;
           }
-        case 170: break;
-        case 84: 
+        case 172: break;
+        case 80: 
           { return JetTokens.TYPE_KEYWORD ;
           }
-        case 171: break;
-        case 73: 
+        case 173: break;
+        case 70: 
           { return JetTokens.FUN_KEYWORD ;
           }
-        case 172: break;
-        case 49: 
+        case 174: break;
+        case 47: 
           { return JetTokens.IS_KEYWORD ;
           }
-        case 173: break;
+        case 175: break;
         case 30: 
           { popState(); yypushback(1); return JetTokens.DANGLING_NEWLINE;
           }
-        case 174: break;
+        case 176: break;
         case 33: 
           { lBraceCount++; return JetTokens.LBRACE;
           }
-        case 175: break;
+        case 177: break;
+        case 85: 
+          { yypushback(3); return JetTokens.EXCL;
+          }
+        case 178: break;
         case 41: 
           { return JetTokens.DIVEQ     ;
           }
-        case 176: break;
-        case 81: 
+        case 179: break;
+        case 82: 
           { return JetTokens.ELSE_KEYWORD ;
           }
-        case 177: break;
-        case 47: 
+        case 180: break;
+        case 50: 
           { return JetTokens.AS_KEYWORD ;
           }
-        case 178: break;
+        case 181: break;
         case 48: 
           { return JetTokens.IN_KEYWORD ;
           }
-        case 179: break;
-        case 52: 
+        case 182: break;
+        case 53: 
           { return JetTokens.EQEQ      ;
           }
-        case 180: break;
-        case 76: 
+        case 183: break;
+        case 77: 
           { return JetTokens.EQEQEQ    ;
           }
-        case 181: break;
-        case 75: 
+        case 184: break;
+        case 73: 
           { return JetTokens.VAL_KEYWORD ;
           }
-        case 182: break;
-        case 86: 
+        case 185: break;
+        case 84: 
           { return JetTokens.CAPITALIZED_THIS_KEYWORD ;
           }
-        case 183: break;
+        case 186: break;
         case 42: 
           { return JetTokens.MULTEQ    ;
           }
-        case 184: break;
-        case 64: 
+        case 187: break;
+        case 62: 
           { pushState(SHORT_TEMPLATE_ENTRY);
                                             yypushback(yylength() - 1);
                                             return JetTokens.SHORT_TEMPLATE_ENTRY_START;
           }
-        case 185: break;
+        case 188: break;
         case 12: 
           { return JetTokens.LBRACE    ;
           }
-        case 186: break;
-        case 92: 
+        case 189: break;
+        case 94: 
           { return JetTokens.OBJECT_KEYWORD ;
           }
-        case 187: break;
-        case 89: 
+        case 190: break;
+        case 91: 
           { return JetTokens.BREAK_KEYWORD ;
           }
-        case 188: break;
+        case 191: break;
         case 40: 
           { return JetTokens.BLOCK_COMMENT;
           }
-        case 189: break;
+        case 192: break;
+        case 88: 
+          { return JetTokens.TRAIT_KEYWORD ;
+          }
+        case 193: break;
         case 28: 
           { return JetTokens.HASH      ;
           }
-        case 190: break;
+        case 194: break;
         default:
           if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
             zzAtEOF = true;