Lexing/parsing better.

1 files changed, 49 insertions, 36 deletions

diff --git a/gen/org/jetbrains/markdown/lexer/_MarkdownLexer.java b/gen/org/jetbrains/markdown/lexer/_MarkdownLexer.java
index c84a83d8..086512a1 100644
--- a/gen/org/jetbrains/markdown/lexer/_MarkdownLexer.java
+++ b/gen/org/jetbrains/markdown/lexer/_MarkdownLexer.java
@@ -1,4 +1,4 @@
-/* The following code was generated by JFlex 1.4.3 on 9/29/14 3:24 PM */
+/* The following code was generated by JFlex 1.4.3 on 9/29/14 10:13 PM */
 
 package org.jetbrains.markdown.lexer;
 
@@ -10,7 +10,7 @@ import static org.jetbrains.markdown.MarkdownElementTypes.*;
 /**
  * This class is a scanner generated by 
  * <a href="http://www.jflex.de/">JFlex</a> 1.4.3
- * on 9/29/14 3:24 PM from the specification file
+ * on 9/29/14 10:13 PM from the specification file
  * <tt>/Users/orangy/Projects/dokka/gen/org/jetbrains/markdown/lexer/_MarkdownLexer.flex</tt>
  */
 public class _MarkdownLexer implements FlexLexer {
@@ -34,10 +34,14 @@ public class _MarkdownLexer implements FlexLexer {
    * Translates characters to character classes
    */
   private static final String ZZ_CMAP_PACKED = 
-    "\11\0\1\7\1\2\1\0\1\3\1\1\22\0\1\7\1\6\1\0"+
-    "\2\6\1\0\1\6\1\0\3\6\3\0\1\5\1\0\2\4\1\14"+
-    "\1\11\1\4\1\12\1\4\1\13\2\4\1\6\1\0\1\6\36\0"+
-    "\1\6\1\10\1\6\1\0\2\6\32\0\1\6\1\0\2\6\uff81\0";
+    "\11\0\1\6\1\2\1\0\1\4\1\1\22\0\1\6\1\5\1\0"+
+    "\2\5\1\0\1\5\1\0\3\5\5\0\2\3\1\13\1\10\1\3"+
+    "\1\11\1\3\1\12\2\3\1\5\1\0\1\5\36\0\1\5\1\7"+
+    "\1\5\1\0\2\5\32\0\1\5\1\0\2\5\u05e1\0\12\3\206\0"+
+    "\12\3\u026c\0\12\3\166\0\12\3\166\0\12\3\166\0\12\3\166\0"+
+    "\12\3\167\0\11\3\166\0\12\3\166\0\12\3\166\0\12\3\340\0"+
+    "\12\3\166\0\12\3\106\0\12\3\u0116\0\12\3\u031f\0\11\3\u046e\0"+
+    "\12\3\46\0\12\3\u012c\0\12\3\ue5c0\0\12\3\346\0";
 
   /** 
    * Translates characters to character classes
@@ -50,11 +54,11 @@ public class _MarkdownLexer implements FlexLexer {
   private static final int [] ZZ_ACTION = zzUnpackAction();
 
   private static final String ZZ_ACTION_PACKED_0 =
-    "\1\0\1\1\2\2\1\3\1\4\1\5\1\3\1\5"+
-    "\1\4\12\0\1\6";
+    "\1\0\1\1\2\2\1\3\1\4\1\5\1\4\1\5"+
+    "\2\6\1\0\1\6\1\1\13\0\1\7";
 
   private static int [] zzUnpackAction() {
-    int [] result = new int[21];
+    int [] result = new int[26];
     int offset = 0;
     offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
     return result;
@@ -79,12 +83,13 @@ public class _MarkdownLexer implements FlexLexer {
   private static final int [] ZZ_ROWMAP = zzUnpackRowMap();
 
   private static final String ZZ_ROWMAP_PACKED_0 =
-    "\0\0\0\15\0\32\0\47\0\15\0\64\0\47\0\47"+
-    "\0\101\0\116\0\133\0\150\0\165\0\202\0\217\0\234"+
-    "\0\251\0\266\0\303\0\320\0\47";
+    "\0\0\0\14\0\30\0\44\0\60\0\74\0\110\0\124"+
+    "\0\140\0\154\0\44\0\44\0\110\0\74\0\124\0\170"+
+    "\0\204\0\220\0\234\0\250\0\264\0\300\0\314\0\330"+
+    "\0\344\0\110";
 
   private static int [] zzUnpackRowMap() {
-    int [] result = new int[21];
+    int [] result = new int[26];
     int offset = 0;
     offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
     return result;
@@ -107,16 +112,19 @@ public class _MarkdownLexer implements FlexLexer {
   private static final int [] ZZ_TRANS = zzUnpackTrans();
 
   private static final String ZZ_TRANS_PACKED_0 =
-    "\1\2\1\3\1\4\1\5\1\6\1\2\1\7\1\10"+
-    "\1\11\4\6\1\2\2\0\3\2\3\0\4\2\2\0"+
-    "\1\4\27\0\1\2\2\0\1\2\1\6\1\12\3\0"+
-    "\4\6\11\0\1\13\3\0\1\2\2\0\1\2\1\12"+
-    "\1\2\3\0\4\12\12\0\1\14\15\0\1\15\11\0"+
-    "\1\16\20\0\1\17\13\0\1\20\12\0\1\21\13\0"+
-    "\1\22\20\0\1\23\13\0\1\24\14\0\1\25\1\0";
+    "\1\2\1\3\1\4\1\5\1\6\1\7\1\10\1\11"+
+    "\4\5\1\2\2\0\2\2\3\0\4\2\1\0\1\12"+
+    "\1\13\1\0\1\14\1\0\1\14\6\0\1\12\1\15"+
+    "\1\0\1\14\1\0\1\14\5\0\1\2\2\0\1\5"+
+    "\1\2\3\0\4\5\1\2\1\3\1\4\1\2\1\16"+
+    "\1\0\1\17\1\0\4\2\15\0\1\3\1\4\1\0"+
+    "\1\17\1\0\1\17\15\0\1\20\5\0\1\15\22\0"+
+    "\1\21\14\0\1\22\10\0\1\23\17\0\1\24\12\0"+
+    "\1\25\11\0\1\26\12\0\1\27\17\0\1\30\12\0"+
+    "\1\31\13\0\1\32\1\0";
 
   private static int [] zzUnpackTrans() {
-    int [] result = new int[221];
+    int [] result = new int[240];
     int offset = 0;
     offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
     return result;
@@ -157,10 +165,11 @@ public class _MarkdownLexer implements FlexLexer {
   private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
 
   private static final String ZZ_ATTRIBUTE_PACKED_0 =
-    "\1\0\2\1\1\11\2\1\2\11\2\1\12\0\1\11";
+    "\1\0\5\1\1\11\4\1\1\0\1\11\1\1\13\0"+
+    "\1\11";
 
   private static int [] zzUnpackAttribute() {
-    int [] result = new int[21];
+    int [] result = new int[26];
     int offset = 0;
     offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
     return result;
@@ -245,7 +254,7 @@ public class _MarkdownLexer implements FlexLexer {
     char [] map = new char[0x10000];
     int i = 0;  /* index in packed string  */
     int j = 0;  /* index in unpacked array */
-    while (i < 80) {
+    while (i < 156) {
       int  count = packed.charAt(i++);
       char value = packed.charAt(i++);
       do map[j++] = value; while (--count > 0);
@@ -455,30 +464,34 @@ public class _MarkdownLexer implements FlexLexer {
       zzMarkedPos = zzMarkedPosL;
 
       switch (zzAction < 0 ? zzAction : ZZ_ACTION[zzAction]) {
-        case 4: 
+        case 3: 
           { return NUMBER;
           }
-        case 7: break;
-        case 5: 
-          { return ANYCHAR;
-          }
         case 8: break;
-        case 2: 
-          { return NEWLINE;
+        case 1: 
+          { return WORD;
           }
         case 9: break;
         case 6: 
-          { return BOM;
+          { return EOP;
           }
         case 10: break;
-        case 3: 
-          { return SPACECHAR;
+        case 7: 
+          { return BOM;
           }
         case 11: break;
-        case 1: 
-          { return STRING;
+        case 2: 
+          { return EOL;
           }
         case 12: break;
+        case 5: 
+          { return SPECIAL;
+          }
+        case 13: break;
+        case 4: 
+          { return SPACE;
+          }
+        case 14: break;
         default:
           if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
             zzAtEOF = true;