mediacloth 0.0.3 → 0.5

data/lib/mediacloth/mediawikiparser.rb

@@ -12,12 +12,14 @@ require 'mediacloth/mediawikiast'
 
 class MediaWikiParser < Racc::Parser
 
-module_eval <<'..end mediawikiparser.y modeval..id2fa3e0400b', 'mediawikiparser.y', 354
+module_eval <<'..end mediawikiparser.y modeval..idbd32b73581', 'mediawikiparser.y', 542
 
 attr_accessor :lexer
 
 def initialize
     @nodes = []
+    @context = []
+    @wiki_ast_length = 0
     super
 end
 
@@ -31,293 +33,541 @@ end
 
 #Asks the lexer to return the next token.
 def next_token
-    return @lexer.lex
+    token = @lexer.lex
+    if token[0].to_s.upcase.include? "_START"
+        @context << token[2..3]
+    elsif token[0].to_s.upcase.include? "_END"
+        @ast_index = @context.last[0]
+        @ast_length = token[2] + token[3] - @context.last[0]
+        @context.pop
+    else
+        @ast_index = token[2]
+        @ast_length = token[3]
+    end
+    
+    @wiki_ast_length += token[3]
+    
+    return token[0..1]
 end
-..end mediawikiparser.y modeval..id2fa3e0400b
+..end mediawikiparser.y modeval..idbd32b73581
 
 ##### racc 1.4.5 generates ###
 
 racc_reduce_table = [
  0, 0, :racc_error,
- 1, 38, :_reduce_1,
- 1, 40, :_reduce_2,
- 1, 40, :_reduce_3,
- 1, 40, :_reduce_4,
- 1, 40, :_reduce_5,
- 1, 40, :_reduce_6,
- 3, 40, :_reduce_7,
- 3, 40, :_reduce_8,
- 6, 40, :_reduce_9,
- 4, 40, :_reduce_10,
- 1, 40, :_reduce_none,
- 0, 46, :_reduce_12,
- 1, 46, :_reduce_13,
- 1, 47, :_reduce_14,
- 3, 47, :_reduce_15,
- 1, 51, :_reduce_16,
- 3, 51, :_reduce_17,
- 0, 49, :_reduce_18,
- 2, 49, :_reduce_19,
- 0, 48, :_reduce_20,
- 2, 48, :_reduce_21,
- 3, 48, :_reduce_22,
- 1, 39, :_reduce_23,
- 2, 39, :_reduce_24,
- 1, 41, :_reduce_25,
- 1, 41, :_reduce_26,
- 3, 50, :_reduce_27,
- 4, 50, :_reduce_28,
- 0, 54, :_reduce_29,
- 4, 54, :_reduce_30,
- 5, 54, :_reduce_31,
- 0, 55, :_reduce_32,
- 3, 55, :_reduce_33,
- 4, 55, :_reduce_34,
- 3, 55, :_reduce_35,
- 4, 55, :_reduce_36,
- 1, 52, :_reduce_37,
- 1, 52, :_reduce_38,
- 1, 52, :_reduce_39,
- 1, 52, :_reduce_40,
- 1, 52, :_reduce_41,
- 2, 53, :_reduce_42,
- 2, 53, :_reduce_43,
- 3, 53, :_reduce_44,
- 3, 53, :_reduce_45,
- 4, 42, :_reduce_46,
- 4, 43, :_reduce_47,
- 0, 58, :_reduce_48,
- 3, 57, :_reduce_49,
- 0, 57, :_reduce_50,
- 2, 56, :_reduce_51,
- 3, 56, :_reduce_52,
- 1, 44, :_reduce_53,
- 3, 45, :_reduce_54 ]
-
-racc_reduce_n = 55
-
-racc_shift_n = 100
+ 1, 58, :_reduce_1,
+ 1, 60, :_reduce_2,
+ 1, 60, :_reduce_3,
+ 1, 60, :_reduce_4,
+ 1, 60, :_reduce_5,
+ 1, 60, :_reduce_6,
+ 1, 60, :_reduce_7,
+ 1, 60, :_reduce_8,
+ 1, 60, :_reduce_9,
+ 1, 60, :_reduce_10,
+ 3, 60, :_reduce_11,
+ 3, 60, :_reduce_12,
+ 3, 60, :_reduce_13,
+ 6, 60, :_reduce_14,
+ 4, 60, :_reduce_15,
+ 5, 60, :_reduce_16,
+ 6, 60, :_reduce_17,
+ 1, 60, :_reduce_none,
+ 0, 69, :_reduce_19,
+ 1, 69, :_reduce_20,
+ 3, 67, :_reduce_21,
+ 4, 67, :_reduce_22,
+ 0, 75, :_reduce_23,
+ 2, 75, :_reduce_24,
+ 3, 75, :_reduce_25,
+ 1, 70, :_reduce_26,
+ 3, 70, :_reduce_27,
+ 1, 76, :_reduce_28,
+ 3, 76, :_reduce_29,
+ 0, 72, :_reduce_30,
+ 2, 72, :_reduce_31,
+ 0, 73, :_reduce_32,
+ 2, 73, :_reduce_33,
+ 0, 71, :_reduce_34,
+ 2, 71, :_reduce_35,
+ 3, 71, :_reduce_36,
+ 1, 59, :_reduce_37,
+ 2, 59, :_reduce_38,
+ 1, 61, :_reduce_39,
+ 1, 61, :_reduce_40,
+ 3, 74, :_reduce_41,
+ 4, 74, :_reduce_42,
+ 0, 79, :_reduce_43,
+ 4, 79, :_reduce_44,
+ 5, 79, :_reduce_45,
+ 0, 80, :_reduce_46,
+ 3, 80, :_reduce_47,
+ 4, 80, :_reduce_48,
+ 3, 80, :_reduce_49,
+ 4, 80, :_reduce_50,
+ 1, 77, :_reduce_51,
+ 1, 77, :_reduce_52,
+ 1, 77, :_reduce_53,
+ 1, 77, :_reduce_54,
+ 1, 77, :_reduce_55,
+ 1, 77, :_reduce_56,
+ 2, 78, :_reduce_57,
+ 2, 78, :_reduce_58,
+ 3, 78, :_reduce_59,
+ 3, 78, :_reduce_60,
+ 4, 62, :_reduce_61,
+ 4, 63, :_reduce_62,
+ 0, 83, :_reduce_63,
+ 3, 82, :_reduce_64,
+ 0, 82, :_reduce_65,
+ 2, 81, :_reduce_66,
+ 3, 81, :_reduce_67,
+ 4, 64, :_reduce_68,
+ 3, 64, :_reduce_69,
+ 2, 84, :_reduce_70,
+ 3, 84, :_reduce_71,
+ 2, 85, :_reduce_72,
+ 0, 85, :_reduce_73,
+ 2, 86, :_reduce_74,
+ 3, 86, :_reduce_75,
+ 3, 65, :_reduce_76,
+ 3, 65, :_reduce_77,
+ 3, 66, :_reduce_78,
+ 4, 68, :_reduce_79,
+ 0, 87, :_reduce_80,
+ 3, 87, :_reduce_81,
+ 3, 87, :_reduce_82 ]
+
+racc_reduce_n = 83
+
+racc_shift_n = 158
 
 racc_action_table = [
-     4,    57,     7,    54,    14,   -48,    36,    23,    57,    72,
-    54,     3,    32,     8,     9,    12,    16,    18,    21,    25,
-    37,    62,    63,     6,     4,    10,     7,    57,    14,    54,
-    56,    23,    57,     5,    54,     3,    37,     8,     9,    12,
-    16,    18,    21,    25,   -50,    47,    57,     6,    54,    10,
-    79,     4,    28,     7,    57,    14,    54,     5,    23,    80,
-    81,    69,     3,    58,     8,     9,    12,    16,    18,    21,
-    25,    32,    37,    86,     6,     4,    10,     7,    43,    14,
-    59,    41,    23,    39,     5,    90,     3,   -50,     8,     9,
-    12,    16,    18,    21,    25,    37,    60,    61,     6,    32,
-    10,    98,     4,    67,     7,   nil,    14,   nil,     5,    23,
-   nil,    90,   nil,     3,   nil,     8,     9,    12,    16,    18,
-    21,    25,   nil,   nil,   nil,     6,     4,    10,     7,    34,
-    14,   nil,   nil,    23,   nil,     5,   nil,     3,   nil,     8,
-     9,    12,    16,    18,    21,    25,   nil,   nil,   nil,     6,
-     4,    10,     7,   nil,    14,   nil,   nil,    23,   nil,     5,
-   nil,     3,   nil,     8,     9,    12,    16,    18,    21,    25,
-   nil,   nil,   nil,     6,     4,    10,     7,   nil,    14,   nil,
-   nil,    23,   nil,     5,   nil,     3,   nil,     8,     9,    12,
-    16,    18,    21,    25,   nil,   nil,   nil,     6,     4,    10,
-     7,   nil,    14,   nil,    89,    23,   nil,     5,   nil,     3,
-   nil,     8,     9,    12,    16,    18,    21,    25,   nil,   nil,
-   nil,     6,     4,    10,     7,   nil,    14,   nil,   nil,    23,
-   nil,     5,   nil,     3,   nil,     8,     9,    12,    16,    18,
-    21,    25,   nil,   nil,   nil,     6,     4,    10,     7,   nil,
-    14,   nil,   nil,    23,   nil,     5,   nil,     3,   nil,     8,
-     9,    12,    16,    18,    21,    25,   nil,   nil,   nil,     6,
-     4,    10,     7,   nil,    14,   nil,    87,    23,   nil,     5,
-   nil,     3,   nil,     8,     9,    12,    16,    18,    21,    25,
-   nil,   nil,   nil,     6,     4,    10,     7,   nil,    14,   nil,
-   nil,    23,    84,     5,   nil,     3,    45,     8,     9,    12,
-    16,    18,    21,    25,   nil,   nil,   nil,     6,   nil,    10,
-   nil,     4,    46,     7,   nil,    14,   nil,     5,    23,   nil,
-   nil,   nil,     3,   nil,     8,     9,    12,    16,    18,    21,
-    25,   nil,   nil,   nil,     6,     4,    10,     7,   nil,    14,
-   nil,   nil,    23,   nil,     5,   nil,     3,   nil,     8,     9,
-    12,    16,    18,    21,    25,   nil,   nil,   nil,     6,     4,
-    10,     7,   nil,    14,   nil,   nil,    23,   nil,     5,   nil,
-     3,   nil,     8,     9,    12,    16,    18,    21,    25,   nil,
-   nil,   nil,     6,     4,    10,     7,   nil,    14,   nil,   nil,
-    23,   nil,     5,   nil,     3,   nil,     8,     9,    12,    16,
-    18,    21,    25,   nil,   nil,    48,     6,     4,    10,     7,
-   nil,    14,   nil,   nil,    23,   nil,     5,   nil,     3,   nil,
-     8,     9,    12,    16,    18,    21,    25,   nil,   nil,   nil,
-     6,     4,    10,     7,    52,    14,   nil,   nil,    23,   nil,
-     5,   nil,     3,   nil,     8,     9,    12,    16,    18,    21,
-    25,   nil,   nil,   nil,     6,     4,    10,     7,   nil,    14,
-   nil,   nil,    23,   nil,     5,   nil,     3,   nil,     8,     9,
-    12,    16,    18,    21,    25,   nil,   nil,   nil,     6,     4,
-    10,     7,   nil,    14,   nil,    75,    23,   nil,     5,   nil,
-     3,   nil,     8,     9,    12,    16,    18,    21,    25,   nil,
-   nil,   nil,     6,     4,    10,     7,   nil,    14,   nil,   nil,
-    23,    70,     5,   nil,     3,   nil,     8,     9,    12,    16,
-    18,    21,    25,   nil,   nil,    66,     6,   nil,    10,   nil,
-     4,   nil,     7,   nil,    14,   nil,     5,    23,   nil,    90,
-   nil,     3,   nil,     8,     9,    12,    16,    18,    21,    25,
-   nil,   nil,   nil,     6,   nil,    10,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,     5 ]
+    10,    12,    63,    19,    97,    25,    99,   119,    35,    97,
+   127,    99,    13,    16,    97,    21,    99,    29,    77,    33,
+     2,     6,     9,    14,    97,    18,    99,    24,    66,   109,
+    96,     1,    97,    37,    99,    38,   110,    22,    51,    65,
+    75,    34,   103,   104,    55,    62,    55,    86,    38,    26,
+    28,    10,    12,     4,    19,   115,    25,    28,    73,    35,
+   106,   145,   120,    13,    16,   102,    21,    38,    29,   124,
+    33,     2,     6,     9,    14,    97,    18,    99,    24,   101,
+    67,    78,     1,   128,    62,   130,   131,    60,    22,   -63,
+    10,    12,    34,    19,    58,    25,    93,    93,    35,   138,
+    26,    28,    13,    16,     4,    21,   -65,    29,    51,    33,
+     2,     6,     9,    14,    62,    18,    55,    24,    93,   103,
+    51,     1,   145,   147,   148,    47,    62,    22,    92,    91,
+   153,    34,   -65,    10,    12,    44,    19,   156,    25,    26,
+    28,    35,   132,     4,   nil,    13,    16,   nil,    21,   nil,
+    29,   nil,    33,     2,     6,     9,    14,   nil,    18,   nil,
+    24,   nil,   nil,   nil,     1,   nil,   nil,   nil,   nil,   nil,
+    22,   nil,    10,    12,    34,    19,   nil,    25,   nil,   nil,
+    35,   nil,    26,    28,    13,    16,     4,    21,   nil,    29,
+   nil,    33,     2,     6,     9,    14,   nil,    18,   nil,    24,
+   nil,   nil,   nil,     1,   nil,   nil,   nil,   nil,   nil,    22,
+   nil,    10,    12,    34,    19,   nil,    25,   nil,   nil,    35,
+   nil,    26,    28,    13,    16,     4,    21,   nil,    29,   nil,
+    33,     2,     6,     9,    14,   nil,    18,   nil,    24,   nil,
+   nil,   nil,     1,   nil,   nil,   nil,   nil,   nil,    22,   nil,
+    10,    12,    34,    19,   nil,    25,   nil,   nil,    35,   nil,
+    26,    28,    13,    16,     4,    21,   nil,    29,   nil,    33,
+     2,     6,     9,    14,   nil,    18,   nil,    24,   nil,   nil,
+   nil,     1,   nil,   nil,   nil,   nil,   nil,    22,   nil,    10,
+    12,    34,    19,   nil,    25,   nil,   nil,    35,   nil,    26,
+    28,    13,    16,     4,    21,   nil,    29,   nil,    33,     2,
+     6,     9,    14,   nil,    18,   nil,    24,   nil,   nil,   nil,
+     1,   nil,   nil,   nil,   nil,   nil,    22,   nil,    10,    12,
+    34,    19,   nil,    25,   nil,   nil,    35,   nil,    26,    28,
+    13,    16,     4,    21,   nil,    29,   nil,    33,     2,     6,
+     9,    14,   nil,    18,   nil,    24,   nil,   nil,   nil,     1,
+   nil,   nil,   nil,   nil,   nil,    22,   nil,    10,    12,    34,
+    19,    53,    25,   nil,   nil,    35,   nil,    26,    28,    13,
+    16,     4,    21,   nil,    29,   nil,    33,     2,     6,     9,
+    14,   nil,    18,   nil,    24,   nil,   nil,   nil,     1,   nil,
+   nil,   nil,   nil,   nil,    22,   nil,    10,    12,    34,    19,
+   nil,    25,   nil,   nil,    35,   nil,    26,    28,    13,    16,
+     4,    21,   nil,    29,   nil,    33,     2,     6,     9,    14,
+   nil,    18,   nil,    24,   nil,   nil,   nil,     1,   nil,   nil,
+   nil,   nil,   nil,    22,   nil,    10,    12,    34,    19,   nil,
+    25,   nil,   nil,    35,   nil,    26,    28,    13,    16,     4,
+    21,   nil,    29,   nil,    33,     2,     6,     9,    14,   nil,
+    18,   nil,    24,   nil,   nil,   nil,     1,   nil,   nil,   nil,
+   nil,   nil,    22,   nil,    10,    12,    34,    19,   nil,    25,
+   nil,   nil,    35,   142,    26,    28,    13,    16,     4,    21,
+   nil,    29,   nil,    33,     2,     6,     9,    14,   nil,    18,
+   nil,    24,   nil,   nil,   nil,     1,   nil,   nil,   nil,   nil,
+   nil,    22,   nil,   nil,   nil,    34,   nil,   nil,   nil,   nil,
+   140,   nil,   nil,    26,    28,    10,    12,     4,    19,   nil,
+    25,   nil,   135,    35,   nil,   nil,   nil,    13,    16,   nil,
+    21,   nil,    29,   nil,    33,     2,     6,     9,    14,   nil,
+    18,   nil,    24,   nil,   nil,   nil,     1,   nil,   nil,   nil,
+   nil,   nil,    22,   nil,    10,    12,    34,    19,   nil,    25,
+   nil,   nil,    35,   nil,    26,    28,    13,    16,     4,    21,
+   nil,    29,   nil,    33,     2,     6,     9,    14,   nil,    18,
+   nil,    24,   nil,   nil,   nil,     1,   nil,   nil,   nil,   nil,
+   nil,    22,    89,    10,    12,    34,    19,   nil,    25,   nil,
+   nil,    35,   nil,    26,    28,    13,    16,     4,    21,   nil,
+    29,   nil,    33,     2,     6,     9,    14,   nil,    18,   nil,
+    24,   nil,   nil,   nil,     1,   nil,   nil,   nil,   nil,   nil,
+    22,   nil,    10,    12,    34,    19,   nil,    25,   nil,   nil,
+    35,   nil,    26,    28,    13,    16,     4,    21,   nil,    29,
+   nil,    33,     2,     6,     9,    14,   nil,    18,   nil,    24,
+   nil,   nil,   nil,     1,   nil,   nil,   nil,   nil,   nil,    22,
+   nil,    10,    12,    34,    19,   nil,    25,   nil,   nil,    35,
+   nil,    26,    28,    13,    16,     4,    21,   nil,    29,   nil,
+    33,     2,     6,     9,    14,   nil,    18,   nil,    24,   nil,
+   nil,   nil,     1,   nil,   nil,   nil,   nil,   nil,    22,   nil,
+    10,    12,    34,    19,   nil,    25,   nil,   nil,    35,   126,
+    26,    28,    13,    16,     4,    21,   nil,    29,   nil,    33,
+     2,     6,     9,    14,   nil,    18,   nil,    24,   nil,   nil,
+   nil,     1,   nil,   nil,    68,   nil,   nil,    22,   nil,    10,
+    12,    34,    19,   nil,    25,   nil,   nil,    35,   nil,    26,
+    28,    13,    16,     4,    21,   nil,    29,   nil,    33,     2,
+     6,     9,    14,   nil,    18,   nil,    24,   nil,   nil,   nil,
+     1,   nil,   nil,   nil,   nil,    71,    22,   nil,    10,    12,
+    34,    19,   nil,    25,   nil,   nil,    35,   nil,    26,    28,
+    13,    16,     4,    21,   nil,    29,   nil,    33,     2,     6,
+     9,    14,   nil,    18,   nil,    24,   nil,   nil,   nil,     1,
+   nil,   nil,   nil,   nil,   nil,    22,   nil,    10,    12,    34,
+    19,   nil,    25,   nil,   122,    35,   nil,    26,    28,    13,
+    16,     4,    21,   nil,    29,   nil,    33,     2,     6,     9,
+    14,   nil,    18,   nil,    24,   nil,   nil,   nil,     1,   nil,
+   nil,   nil,   nil,   nil,    22,   nil,    10,    12,    34,    19,
+   nil,    25,   nil,   nil,    35,   nil,    26,    28,    13,    16,
+     4,    21,   nil,    29,   nil,    33,     2,     6,     9,    14,
+   nil,    18,   nil,    24,   nil,   nil,   nil,     1,   nil,   nil,
+   nil,   nil,   nil,    22,   114,    10,    12,    34,    19,   nil,
+    25,   nil,   nil,    35,   nil,    26,    28,    13,    16,     4,
+    21,   nil,    29,   nil,    33,     2,     6,     9,    14,   nil,
+    18,   nil,    24,   nil,   nil,   112,     1,   nil,   nil,   nil,
+   nil,   nil,    22,   nil,    10,    12,    34,    19,   nil,    25,
+   nil,   nil,    35,   nil,    26,    28,    13,    16,     4,    21,
+   nil,    29,   nil,    33,     2,     6,     9,    14,   nil,    18,
+   nil,    24,   nil,   nil,   nil,     1,   nil,   nil,   nil,   nil,
+   nil,    22,   nil,   nil,   nil,    34,   nil,    10,    12,    76,
+    19,   nil,    25,    26,    28,    35,   nil,     4,   nil,    13,
+    16,   nil,    21,   nil,    29,   nil,    33,     2,     6,     9,
+    14,   nil,    18,   nil,    24,   nil,   nil,   nil,     1,   nil,
+   nil,   nil,   nil,   nil,    22,   nil,    10,    12,    34,    19,
+   nil,    25,   nil,   nil,    35,   nil,    26,    28,    13,    16,
+     4,    21,   nil,    29,   nil,    33,     2,     6,     9,    14,
+   nil,    18,   nil,    24,   nil,   nil,   nil,     1,   nil,   nil,
+   nil,   nil,   108,    22,   nil,    10,    12,    34,    19,   nil,
+    25,   nil,   nil,    35,   nil,    26,    28,    13,    16,     4,
+    21,   nil,    29,   nil,    33,     2,     6,     9,    14,   nil,
+    18,   nil,    24,   nil,   nil,   nil,     1,   nil,   nil,   107,
+   nil,   nil,    22,   nil,   nil,   nil,    34,   nil,    10,    12,
+   nil,    19,   nil,    25,    26,    28,    35,   nil,     4,   nil,
+    13,    16,    79,    21,   nil,    29,   nil,    33,     2,     6,
+     9,    14,   nil,    18,   nil,    24,   nil,   nil,   nil,     1,
+   nil,   nil,   nil,   nil,   nil,    22,   nil,    10,    12,    34,
+    19,   nil,    25,   nil,   nil,    35,   nil,    26,    28,    13,
+    16,     4,    21,   nil,    29,    95,    33,     2,     6,     9,
+    14,   nil,    18,   nil,    24,   nil,   nil,   nil,     1,   nil,
+   nil,   nil,   nil,   nil,    22,   nil,    10,    12,    34,    19,
+   nil,    25,   nil,   nil,    35,   nil,    26,    28,    13,    16,
+     4,    21,   nil,    29,   nil,    33,     2,     6,     9,    14,
+   nil,    18,   nil,    24,   nil,   nil,    83,     1,   nil,   nil,
+   nil,   nil,   nil,    22,   nil,    10,    12,    34,    19,    84,
+    25,   nil,   nil,    35,   nil,    26,    28,    13,    16,     4,
+    21,   nil,    29,   nil,    33,     2,     6,     9,    14,   nil,
+    18,   nil,    24,   nil,   nil,   nil,     1,   nil,   nil,   nil,
+   nil,   nil,    22,   nil,    10,    12,    34,    19,   nil,    25,
+   nil,   nil,    35,   nil,    26,    28,    13,    16,     4,    21,
+    85,    29,   nil,    33,     2,     6,     9,    14,   nil,    18,
+   nil,    24,   nil,   nil,   nil,     1,   nil,   nil,   nil,   nil,
+   nil,    22,   nil,   nil,   nil,    34,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    26,    28,    10,    12,     4,    19,   nil,
+    25,   nil,   nil,    35,   nil,   145,   nil,    13,    16,   nil,
+    21,   nil,    29,   nil,    33,     2,     6,     9,    14,   nil,
+    18,   nil,    24,   nil,   nil,   nil,     1,   nil,   nil,   nil,
+   nil,   nil,    22,   nil,   nil,   nil,    34,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,    26,    28,   nil,   nil,     4 ]
 
 racc_action_check = [
-     0,    84,     0,    84,     0,    68,    10,     0,    87,    55,
-    87,     0,    51,     0,     0,     0,     0,     0,     0,     0,
-    10,    43,    43,     0,     3,     0,     3,    56,     3,    56,
-    37,     3,    70,     0,    70,     3,    36,     3,     3,     3,
-     3,     3,     3,     3,    33,    30,    37,     3,    37,     3,
-    63,     4,     4,     4,    75,     4,    75,     3,     4,    64,
-    65,    53,     4,    38,     4,     4,     4,     4,     4,     4,
-     4,    25,    72,    73,     4,     5,     4,     5,    23,     5,
-    39,    14,     5,    11,     4,    79,     5,    44,     5,     5,
-     5,     5,     5,     5,     5,    86,    40,    41,     5,     6,
-     5,    91,    90,    50,    90,   nil,    90,   nil,     5,    90,
-   nil,    90,   nil,    90,   nil,    90,    90,    90,    90,    90,
-    90,    90,   nil,   nil,   nil,    90,     7,    90,     7,     7,
-     7,   nil,   nil,     7,   nil,    90,   nil,     7,   nil,     7,
-     7,     7,     7,     7,     7,     7,   nil,   nil,   nil,     7,
-    89,     7,    89,   nil,    89,   nil,   nil,    89,   nil,     7,
-   nil,    89,   nil,    89,    89,    89,    89,    89,    89,    89,
-   nil,   nil,   nil,    89,    78,    89,    78,   nil,    78,   nil,
-   nil,    78,   nil,    89,   nil,    78,   nil,    78,    78,    78,
-    78,    78,    78,    78,   nil,   nil,   nil,    78,    76,    78,
-    76,   nil,    76,   nil,    76,    76,   nil,    78,   nil,    76,
-   nil,    76,    76,    76,    76,    76,    76,    76,   nil,   nil,
-   nil,    76,    15,    76,    15,   nil,    15,   nil,   nil,    15,
-   nil,    76,   nil,    15,   nil,    15,    15,    15,    15,    15,
-    15,    15,   nil,   nil,   nil,    15,    74,    15,    74,   nil,
-    74,   nil,   nil,    74,   nil,    15,   nil,    74,   nil,    74,
-    74,    74,    74,    74,    74,    74,   nil,   nil,   nil,    74,
-    71,    74,    71,   nil,    71,   nil,    74,    71,   nil,    74,
-   nil,    71,   nil,    71,    71,    71,    71,    71,    71,    71,
-   nil,   nil,   nil,    71,    27,    71,    27,   nil,    27,   nil,
-   nil,    27,    71,    71,   nil,    27,    27,    27,    27,    27,
-    27,    27,    27,    27,   nil,   nil,   nil,    27,   nil,    27,
-   nil,    29,    29,    29,   nil,    29,   nil,    27,    29,   nil,
-   nil,   nil,    29,   nil,    29,    29,    29,    29,    29,    29,
-    29,   nil,   nil,   nil,    29,    62,    29,    62,   nil,    62,
-   nil,   nil,    62,   nil,    29,   nil,    62,   nil,    62,    62,
-    62,    62,    62,    62,    62,   nil,   nil,   nil,    62,    31,
-    62,    31,   nil,    31,   nil,   nil,    31,   nil,    62,   nil,
-    31,   nil,    31,    31,    31,    31,    31,    31,    31,   nil,
-   nil,   nil,    31,    32,    31,    32,   nil,    32,   nil,   nil,
-    32,   nil,    31,   nil,    32,   nil,    32,    32,    32,    32,
-    32,    32,    32,   nil,   nil,    32,    32,    61,    32,    61,
-   nil,    61,   nil,   nil,    61,   nil,    32,   nil,    61,   nil,
-    61,    61,    61,    61,    61,    61,    61,   nil,   nil,   nil,
-    61,    35,    61,    35,    35,    35,   nil,   nil,    35,   nil,
-    61,   nil,    35,   nil,    35,    35,    35,    35,    35,    35,
-    35,   nil,   nil,   nil,    35,    57,    35,    57,   nil,    57,
-   nil,   nil,    57,   nil,    35,   nil,    57,   nil,    57,    57,
-    57,    57,    57,    57,    57,   nil,   nil,   nil,    57,    54,
-    57,    54,   nil,    54,   nil,    57,    54,   nil,    57,   nil,
-    54,   nil,    54,    54,    54,    54,    54,    54,    54,   nil,
-   nil,   nil,    54,    49,    54,    49,   nil,    49,   nil,   nil,
-    49,    54,    54,   nil,    49,   nil,    49,    49,    49,    49,
-    49,    49,    49,   nil,   nil,    49,    49,   nil,    49,   nil,
-    97,   nil,    97,   nil,    97,   nil,    49,    97,   nil,    97,
-   nil,    97,   nil,    97,    97,    97,    97,    97,    97,    97,
-   nil,   nil,   nil,    97,   nil,    97,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    97 ]
+     0,     0,    34,     0,   140,     0,   140,    93,     0,   122,
+   100,   122,     0,     0,   142,     0,   142,     0,    46,     0,
+     0,     0,     0,     0,   126,     0,   126,     0,    35,    72,
+    62,     0,    96,     1,    96,     1,    80,     0,    81,    35,
+    42,     0,    66,    66,    86,    34,    55,    55,    41,     0,
+     0,   145,   145,     0,   145,    90,   145,    93,    40,   145,
+    67,   145,    94,   145,   145,    65,   145,    39,   145,    98,
+   145,   145,   145,   145,   145,    62,   145,    62,   145,    64,
+    35,    47,   145,   102,    63,   104,   105,    28,   145,   111,
+     4,     4,   145,     4,    25,     4,   118,   119,     4,   121,
+   145,   145,     4,     4,   145,     4,    50,     4,    24,     4,
+     4,     4,     4,     4,   124,     4,    22,     4,    60,   128,
+    18,     4,   130,   132,   133,    15,   138,     4,    59,    58,
+   144,     4,    57,    12,    12,    12,    12,   146,    12,     4,
+     4,    12,   106,     4,   nil,    12,    12,   nil,    12,   nil,
+    12,   nil,    12,    12,    12,    12,    12,   nil,    12,   nil,
+    12,   nil,   nil,   nil,    12,   nil,   nil,   nil,   nil,   nil,
+    12,   nil,    14,    14,    12,    14,   nil,    14,   nil,   nil,
+    14,   nil,    12,    12,    14,    14,    12,    14,   nil,    14,
+   nil,    14,    14,    14,    14,    14,   nil,    14,   nil,    14,
+   nil,   nil,   nil,    14,   nil,   nil,   nil,   nil,   nil,    14,
+   nil,   135,   135,    14,   135,   nil,   135,   nil,   nil,   135,
+   nil,    14,    14,   135,   135,    14,   135,   nil,   135,   nil,
+   135,   135,   135,   135,   135,   nil,   135,   nil,   135,   nil,
+   nil,   nil,   135,   nil,   nil,   nil,   nil,   nil,   135,   nil,
+    16,    16,   135,    16,   nil,    16,   nil,   nil,    16,   nil,
+   135,   135,    16,    16,   135,    16,   nil,    16,   nil,    16,
+    16,    16,    16,    16,   nil,    16,   nil,    16,   nil,   nil,
+   nil,    16,   nil,   nil,   nil,   nil,   nil,    16,   nil,    17,
+    17,    16,    17,   nil,    17,   nil,   nil,    17,   nil,    16,
+    16,    17,    17,    16,    17,   nil,    17,   nil,    17,    17,
+    17,    17,    17,   nil,    17,   nil,    17,   nil,   nil,   nil,
+    17,   nil,   nil,   nil,   nil,   nil,    17,   nil,   129,   129,
+    17,   129,   nil,   129,   nil,   nil,   129,   nil,    17,    17,
+   129,   129,    17,   129,   nil,   129,   nil,   129,   129,   129,
+   129,   129,   nil,   129,   nil,   129,   nil,   nil,   nil,   129,
+   nil,   nil,   nil,   nil,   nil,   129,   nil,    19,    19,   129,
+    19,    19,    19,   nil,   nil,    19,   nil,   129,   129,    19,
+    19,   129,    19,   nil,    19,   nil,    19,    19,    19,    19,
+    19,   nil,    19,   nil,    19,   nil,   nil,   nil,    19,   nil,
+   nil,   nil,   nil,   nil,    19,   nil,    21,    21,    19,    21,
+   nil,    21,   nil,   nil,    21,   nil,    19,    19,    21,    21,
+    19,    21,   nil,    21,   nil,    21,    21,    21,    21,    21,
+   nil,    21,   nil,    21,   nil,   nil,   nil,    21,   nil,   nil,
+   nil,   nil,   nil,    21,   nil,   125,   125,    21,   125,   nil,
+   125,   nil,   nil,   125,   nil,    21,    21,   125,   125,    21,
+   125,   nil,   125,   nil,   125,   125,   125,   125,   125,   nil,
+   125,   nil,   125,   nil,   nil,   nil,   125,   nil,   nil,   nil,
+   nil,   nil,   125,   nil,   123,   123,   125,   123,   nil,   123,
+   nil,   nil,   123,   125,   125,   125,   123,   123,   125,   123,
+   nil,   123,   nil,   123,   123,   123,   123,   123,   nil,   123,
+   nil,   123,   nil,   nil,   nil,   123,   nil,   nil,   nil,   nil,
+   nil,   123,   nil,   nil,   nil,   123,   nil,   nil,   nil,   nil,
+   123,   nil,   nil,   123,   123,   116,   116,   123,   116,   nil,
+   116,   nil,   116,   116,   nil,   nil,   nil,   116,   116,   nil,
+   116,   nil,   116,   nil,   116,   116,   116,   116,   116,   nil,
+   116,   nil,   116,   nil,   nil,   nil,   116,   nil,   nil,   nil,
+   nil,   nil,   116,   nil,    56,    56,   116,    56,   nil,    56,
+   nil,   nil,    56,   nil,   116,   116,    56,    56,   116,    56,
+   nil,    56,   nil,    56,    56,    56,    56,    56,   nil,    56,
+   nil,    56,   nil,   nil,   nil,    56,   nil,   nil,   nil,   nil,
+   nil,    56,    56,    29,    29,    56,    29,   nil,    29,   nil,
+   nil,    29,   nil,    56,    56,    29,    29,    56,    29,   nil,
+    29,   nil,    29,    29,    29,    29,    29,   nil,    29,   nil,
+    29,   nil,   nil,   nil,    29,   nil,   nil,   nil,   nil,   nil,
+    29,   nil,   103,   103,    29,   103,   nil,   103,   nil,   nil,
+   103,   nil,    29,    29,   103,   103,    29,   103,   nil,   103,
+   nil,   103,   103,   103,   103,   103,   nil,   103,   nil,   103,
+   nil,   nil,   nil,   103,   nil,   nil,   nil,   nil,   nil,   103,
+   nil,    99,    99,   103,    99,   nil,    99,   nil,   nil,    99,
+   nil,   103,   103,    99,    99,   103,    99,   nil,    99,   nil,
+    99,    99,    99,    99,    99,   nil,    99,   nil,    99,   nil,
+   nil,   nil,    99,   nil,   nil,   nil,   nil,   nil,    99,   nil,
+    37,    37,    99,    37,   nil,    37,   nil,   nil,    37,    99,
+    99,    99,    37,    37,    99,    37,   nil,    37,   nil,    37,
+    37,    37,    37,    37,   nil,    37,   nil,    37,   nil,   nil,
+   nil,    37,   nil,   nil,    37,   nil,   nil,    37,   nil,    38,
+    38,    37,    38,   nil,    38,   nil,   nil,    38,   nil,    37,
+    37,    38,    38,    37,    38,   nil,    38,   nil,    38,    38,
+    38,    38,    38,   nil,    38,   nil,    38,   nil,   nil,   nil,
+    38,   nil,   nil,   nil,   nil,    38,    38,   nil,    97,    97,
+    38,    97,   nil,    97,   nil,   nil,    97,   nil,    38,    38,
+    97,    97,    38,    97,   nil,    97,   nil,    97,    97,    97,
+    97,    97,   nil,    97,   nil,    97,   nil,   nil,   nil,    97,
+   nil,   nil,   nil,   nil,   nil,    97,   nil,    91,    91,    97,
+    91,   nil,    91,   nil,    97,    91,   nil,    97,    97,    91,
+    91,    97,    91,   nil,    91,   nil,    91,    91,    91,    91,
+    91,   nil,    91,   nil,    91,   nil,   nil,   nil,    91,   nil,
+   nil,   nil,   nil,   nil,    91,   nil,    88,    88,    91,    88,
+   nil,    88,   nil,   nil,    88,   nil,    91,    91,    88,    88,
+    91,    88,   nil,    88,   nil,    88,    88,    88,    88,    88,
+   nil,    88,   nil,    88,   nil,   nil,   nil,    88,   nil,   nil,
+   nil,   nil,   nil,    88,    88,    82,    82,    88,    82,   nil,
+    82,   nil,   nil,    82,   nil,    88,    88,    82,    82,    88,
+    82,   nil,    82,   nil,    82,    82,    82,    82,    82,   nil,
+    82,   nil,    82,   nil,   nil,    82,    82,   nil,   nil,   nil,
+   nil,   nil,    82,   nil,    43,    43,    82,    43,   nil,    43,
+   nil,   nil,    43,   nil,    82,    82,    43,    43,    82,    43,
+   nil,    43,   nil,    43,    43,    43,    43,    43,   nil,    43,
+   nil,    43,   nil,   nil,   nil,    43,   nil,   nil,   nil,   nil,
+   nil,    43,   nil,   nil,   nil,    43,   nil,    45,    45,    45,
+    45,   nil,    45,    43,    43,    45,   nil,    43,   nil,    45,
+    45,   nil,    45,   nil,    45,   nil,    45,    45,    45,    45,
+    45,   nil,    45,   nil,    45,   nil,   nil,   nil,    45,   nil,
+   nil,   nil,   nil,   nil,    45,   nil,    70,    70,    45,    70,
+   nil,    70,   nil,   nil,    70,   nil,    45,    45,    70,    70,
+    45,    70,   nil,    70,   nil,    70,    70,    70,    70,    70,
+   nil,    70,   nil,    70,   nil,   nil,   nil,    70,   nil,   nil,
+   nil,   nil,    70,    70,   nil,    69,    69,    70,    69,   nil,
+    69,   nil,   nil,    69,   nil,    70,    70,    69,    69,    70,
+    69,   nil,    69,   nil,    69,    69,    69,    69,    69,   nil,
+    69,   nil,    69,   nil,   nil,   nil,    69,   nil,   nil,    69,
+   nil,   nil,    69,   nil,   nil,   nil,    69,   nil,    48,    48,
+   nil,    48,   nil,    48,    69,    69,    48,   nil,    69,   nil,
+    48,    48,    48,    48,   nil,    48,   nil,    48,    48,    48,
+    48,    48,   nil,    48,   nil,    48,   nil,   nil,   nil,    48,
+   nil,   nil,   nil,   nil,   nil,    48,   nil,    61,    61,    48,
+    61,   nil,    61,   nil,   nil,    61,   nil,    48,    48,    61,
+    61,    48,    61,   nil,    61,    61,    61,    61,    61,    61,
+    61,   nil,    61,   nil,    61,   nil,   nil,   nil,    61,   nil,
+   nil,   nil,   nil,   nil,    61,   nil,    51,    51,    61,    51,
+   nil,    51,   nil,   nil,    51,   nil,    61,    61,    51,    51,
+    61,    51,   nil,    51,   nil,    51,    51,    51,    51,    51,
+   nil,    51,   nil,    51,   nil,   nil,    51,    51,   nil,   nil,
+   nil,   nil,   nil,    51,   nil,    52,    52,    51,    52,    52,
+    52,   nil,   nil,    52,   nil,    51,    51,    52,    52,    51,
+    52,   nil,    52,   nil,    52,    52,    52,    52,    52,   nil,
+    52,   nil,    52,   nil,   nil,   nil,    52,   nil,   nil,   nil,
+   nil,   nil,    52,   nil,    54,    54,    52,    54,   nil,    54,
+   nil,   nil,    54,   nil,    52,    52,    54,    54,    52,    54,
+    54,    54,   nil,    54,    54,    54,    54,    54,   nil,    54,
+   nil,    54,   nil,   nil,   nil,    54,   nil,   nil,   nil,   nil,
+   nil,    54,   nil,   nil,   nil,    54,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    54,    54,   154,   154,    54,   154,   nil,
+   154,   nil,   nil,   154,   nil,   154,   nil,   154,   154,   nil,
+   154,   nil,   154,   nil,   154,   154,   154,   154,   154,   nil,
+   154,   nil,   154,   nil,   nil,   nil,   154,   nil,   nil,   nil,
+   nil,   nil,   154,   nil,   nil,   nil,   154,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   154,   154,   nil,   nil,   154 ]
 
 racc_action_pointer = [
-    -2,   nil,   nil,    22,    49,    73,    76,   124,   nil,   nil,
-    -9,    83,   nil,   nil,    66,   220,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    63,   nil,    48,   nil,   292,   nil,   319,
-     9,   367,   391,    18,   nil,   439,     7,    15,    35,    80,
-    89,    89,   nil,    10,    65,   nil,   nil,   nil,   nil,   511,
-    77,   -11,   nil,    33,   487,   -21,    -4,   463,   nil,   nil,
-   nil,   415,   343,    35,    49,    38,   nil,   nil,   -18,   nil,
-     1,   268,    43,    43,   244,    23,   196,   nil,   172,    74,
-   nil,   nil,   nil,   nil,   -30,   nil,    66,   -23,   nil,   148,
-   100,    91,   nil,   nil,   nil,   nil,   nil,   538,   nil,   nil ]
+    -2,    -2,   nil,   nil,    88,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   131,   nil,   170,   125,   248,   287,    89,   365,
+   nil,   404,    75,   nil,    77,    92,   nil,   nil,    85,   611,
+   nil,   nil,   nil,   nil,     0,    26,   nil,   728,   767,    30,
+    24,    11,   -16,   962,   nil,  1005,    -8,    81,  1126,   nil,
+    78,  1204,  1243,   nil,  1282,     5,   572,   102,   120,   120,
+   106,  1165,    28,    39,    35,    11,    30,    58,   nil,  1083,
+  1044,   nil,    -5,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+     8,     7,   923,   nil,   nil,   nil,     3,   nil,   884,   nil,
+    25,   845,   nil,     5,     9,   nil,   -15,   806,    23,   689,
+   -34,   nil,    81,   650,    83,    75,   130,   nil,   nil,   nil,
+   nil,    58,   nil,   nil,   nil,   nil,   533,   nil,    84,    85,
+   nil,    53,   -38,   482,    69,   443,   -23,   nil,   107,   326,
+   110,   nil,   121,   113,   nil,   209,   nil,   nil,    81,   nil,
+   -43,   nil,   -33,   nil,   119,    49,   126,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,  1333,   nil,   nil,   nil ]
 
 racc_action_default = [
-   -55,    -5,    -6,   -55,   -55,   -12,   -55,   -55,   -37,   -53,
-   -29,   -55,   -38,   -11,   -55,    -1,   -40,   -23,   -39,   -25,
-    -2,   -41,   -26,   -55,    -3,   -55,    -4,   -55,   -42,   -55,
-   -55,   -13,   -55,   -48,   -43,   -55,   -29,   -32,   -55,   -55,
-   -55,   -14,   -24,   -18,   -48,   -54,   -44,    -7,   -51,   -55,
-   -55,   -55,   -45,   -55,   -55,   -55,   -32,   -55,   -27,   100,
-    -8,   -55,   -55,   -55,   -55,   -55,   -52,   -47,   -50,   -28,
-   -32,   -55,   -29,   -55,   -55,   -32,   -16,   -15,   -19,   -20,
-   -10,   -46,   -49,   -35,   -32,   -30,   -29,   -32,   -33,   -55,
-   -20,   -55,   -36,   -31,   -34,   -17,   -21,   -20,    -9,   -22 ]
+   -83,   -73,   -55,   -39,   -19,    -7,   -54,   -40,    -8,   -56,
+   -51,    -9,   -83,   -53,   -19,   -83,   -83,    -1,   -83,   -83,
+   -37,   -83,   -23,    -2,   -83,   -83,   -10,    -3,   -83,   -83,
+   -18,    -4,    -5,   -52,   -43,   -83,    -6,   -83,   -83,   -73,
+   -83,   -73,   -83,   -20,   -57,   -83,   -83,   -83,   -83,   -38,
+   -63,   -83,   -83,   -58,   -83,   -23,   -83,   -63,   -26,   -83,
+   -80,   -83,   -46,   -43,   -83,   -83,   -30,   -83,   -70,   -83,
+   -83,   -74,   -83,   -69,   -72,   -13,   -59,   -11,   158,   -76,
+   -83,   -83,   -83,   -66,   -60,   -77,   -23,   -24,   -83,   -21,
+   -83,   -83,   -12,   -83,   -83,   -78,   -46,   -83,   -83,   -83,
+   -83,   -41,   -83,   -83,   -83,   -83,   -32,   -71,   -75,   -68,
+   -61,   -65,   -67,   -25,   -22,   -62,   -28,   -27,   -80,   -80,
+   -79,   -83,   -46,   -83,   -43,   -83,   -46,   -42,   -30,   -31,
+   -34,   -15,   -83,   -83,   -64,   -83,   -82,   -81,   -43,   -47,
+   -46,   -44,   -46,   -49,   -83,   -34,   -83,   -33,   -16,   -29,
+   -45,   -48,   -50,   -17,   -34,   -35,   -14,   -36 ]
 
 racc_goto_table = [
-    15,    55,    42,    27,    29,    31,    50,    35,    33,    38,
-    77,    64,    91,    40,    42,    30,    42,    65,    42,    11,
-    73,   nil,    42,    96,   nil,   nil,   nil,    44,   nil,   nil,
-    99,   nil,    49,   nil,    83,    53,    42,   nil,    95,    88,
-   nil,    82,   nil,   nil,   nil,   nil,   nil,   nil,    92,   nil,
-   nil,    94,   nil,    68,    71,   nil,   nil,    74,    42,   nil,
-   nil,    42,    78,    42,   nil,    42,   nil,   nil,   nil,   nil,
-   nil,    85,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,    42,    93,   nil,   nil,   nil,   nil,
-    97 ]
+    17,    98,   105,    64,    50,    49,   117,    80,    56,   133,
+    57,   118,    45,    42,    90,    94,    48,    39,    59,    52,
+    15,    54,    40,    46,   146,   nil,   nil,   nil,   nil,    61,
+   nil,    49,   100,    49,   nil,   121,    49,    69,    70,   155,
+    49,    87,    49,   nil,   nil,   nil,   nil,   nil,   157,    49,
+   149,    82,   nil,   nil,   nil,   nil,    88,    49,    49,   nil,
+    72,   139,    74,   nil,   144,   143,   nil,   111,   134,   nil,
+    49,   nil,   113,   136,   137,   nil,    49,   nil,   nil,   151,
+   nil,   152,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   116,   nil,   141,   nil,   nil,   nil,   123,   nil,   125,
+   nil,   nil,   nil,   129,    49,   nil,   nil,   150,   nil,   nil,
+   nil,    49,   nil,    49,   nil,   nil,   nil,    49,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   116,   nil,   nil,   nil,   nil,
+   nil,   nil,    49,   nil,   nil,   154 ]
 
 racc_goto_check = [
-     2,    18,     3,     2,     2,     2,    20,     2,    19,    17,
-    14,    12,    11,    10,     3,     9,     3,    20,     3,     1,
-    18,   nil,     3,    11,   nil,   nil,   nil,    19,   nil,   nil,
-    11,   nil,     2,   nil,    18,    17,     3,   nil,    14,    18,
-   nil,    20,   nil,   nil,   nil,   nil,   nil,   nil,    18,   nil,
-   nil,    18,   nil,    19,     2,   nil,   nil,     2,     3,   nil,
-   nil,     3,     2,     3,   nil,     3,   nil,   nil,   nil,   nil,
-   nil,    17,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,     3,    17,   nil,   nil,   nil,   nil,
-     2 ]
+     2,    23,    15,    22,    24,     3,    19,    25,    18,    16,
+    24,    11,     2,    12,    25,    30,     2,    27,    13,     2,
+     1,     2,    28,    12,    14,   nil,   nil,   nil,   nil,     2,
+   nil,     3,    22,     3,   nil,    23,     3,     2,     2,    14,
+     3,    18,     3,   nil,   nil,   nil,   nil,   nil,    14,     3,
+    19,     2,   nil,   nil,   nil,   nil,     2,     3,     3,   nil,
+    28,    23,    28,   nil,    15,    23,   nil,    24,    25,   nil,
+     3,   nil,    18,    30,    30,   nil,     3,   nil,   nil,    23,
+   nil,    23,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,     2,   nil,    22,   nil,   nil,   nil,     2,   nil,     2,
+   nil,   nil,   nil,     2,     3,   nil,   nil,    22,   nil,   nil,
+   nil,     3,   nil,     3,   nil,   nil,   nil,     3,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,     2,   nil,   nil,   nil,   nil,
+   nil,   nil,     3,   nil,   nil,     2 ]
 
 racc_goto_pointer = [
-   nil,    19,     0,   -13,   nil,   nil,   nil,   nil,   nil,    10,
-    -1,   -67,   -32,   nil,   -51,   nil,   nil,    -1,   -36,     2,
-   -27,   nil ]
+   nil,    20,     0,   -12,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   -82,     9,    -7,  -106,   -64,   -97,   nil,   -14,   -85,
+   nil,   nil,   -31,   -61,   -14,   -43,   nil,    16,    21,   nil,
+   -45 ]
 
 racc_goto_default = [
-   nil,   nil,    76,    17,    20,    24,    26,     1,     2,   nil,
-   nil,   nil,   nil,    13,   nil,    19,    22,   nil,   nil,   nil,
-   nil,    51 ]
+   nil,   nil,    43,    20,    23,    27,    31,    32,    36,     5,
+     8,    11,   nil,   nil,   nil,   nil,   nil,    30,   nil,   nil,
+     3,     7,   nil,   nil,   nil,   nil,    81,   nil,   nil,    41,
+   nil ]
 
 racc_token_table = {
  false => 0,
  Object.new => 1,
- :BOLDSTART => 2,
- :BOLDEND => 3,
- :ITALICSTART => 4,
- :ITALICEND => 5,
- :LINKSTART => 6,
- :LINKEND => 7,
- :LINKSEP => 8,
- :INTLINKSTART => 9,
- :INTLINKEND => 10,
- :INTLINKSEP => 11,
- :RESOURCE_SEP => 12,
- :SECTION_START => 13,
- :SECTION_END => 14,
- :TEXT => 15,
- :PRE => 16,
- :HLINE => 17,
- :SIGNATURE_NAME => 18,
- :SIGNATURE_DATE => 19,
- :SIGNATURE_FULL => 20,
- :UL_START => 21,
- :UL_END => 22,
- :LI_START => 23,
- :LI_END => 24,
- :OL_START => 25,
- :OL_END => 26,
- :TABLE_START => 27,
- :TABLE_END => 28,
- :ROW_START => 29,
- :ROW_END => 30,
- :HEAD_START => 31,
- :HEAD_END => 32,
- :CELL_START => 33,
- :CELL_END => 34,
- :PARA_START => 35,
- :PARA_END => 36 }
+ :TEXT => 2,
+ :BOLD_START => 3,
+ :BOLD_END => 4,
+ :ITALIC_START => 5,
+ :ITALIC_END => 6,
+ :LINK_START => 7,
+ :LINK_END => 8,
+ :LINKSEP => 9,
+ :INTLINK_START => 10,
+ :INTLINK_END => 11,
+ :INTLINKSEP => 12,
+ :RESOURCESEP => 13,
+ :CHAR_ENT => 14,
+ :PRE_START => 15,
+ :PRE_END => 16,
+ :PREINDENT_START => 17,
+ :PREINDENT_END => 18,
+ :SECTION_START => 19,
+ :SECTION_END => 20,
+ :HLINE => 21,
+ :SIGNATURE_NAME => 22,
+ :SIGNATURE_DATE => 23,
+ :SIGNATURE_FULL => 24,
+ :PARA_START => 25,
+ :PARA_END => 26,
+ :UL_START => 27,
+ :UL_END => 28,
+ :OL_START => 29,
+ :OL_END => 30,
+ :LI_START => 31,
+ :LI_END => 32,
+ :DL_START => 33,
+ :DL_END => 34,
+ :DT_START => 35,
+ :DT_END => 36,
+ :DD_START => 37,
+ :DD_END => 38,
+ :TAG_START => 39,
+ :TAG_END => 40,
+ :ATTR_NAME => 41,
+ :ATTR_VALUE => 42,
+ :TABLE_START => 43,
+ :TABLE_END => 44,
+ :ROW_START => 45,
+ :ROW_END => 46,
+ :HEAD_START => 47,
+ :HEAD_END => 48,
+ :CELL_START => 49,
+ :CELL_END => 50,
+ :KEYWORD => 51,
+ :TEMPLATE_START => 52,
+ :TEMPLATE_END => 53,
+ :CATEGORY => 54,
+ :PASTE_START => 55,
+ :PASTE_END => 56 }
 
 racc_use_result_var = true
 
-racc_nt_base = 37
+racc_nt_base = 57
 
 Racc_arg = [
  racc_action_table,
@@ -338,31 +588,47 @@ Racc_arg = [
 Racc_token_to_s_table = [
 '$end',
 'error',
-'BOLDSTART',
-'BOLDEND',
-'ITALICSTART',
-'ITALICEND',
-'LINKSTART',
-'LINKEND',
+'TEXT',
+'BOLD_START',
+'BOLD_END',
+'ITALIC_START',
+'ITALIC_END',
+'LINK_START',
+'LINK_END',
 'LINKSEP',
-'INTLINKSTART',
-'INTLINKEND',
+'INTLINK_START',
+'INTLINK_END',
 'INTLINKSEP',
-'RESOURCE_SEP',
+'RESOURCESEP',
+'CHAR_ENT',
+'PRE_START',
+'PRE_END',
+'PREINDENT_START',
+'PREINDENT_END',
 'SECTION_START',
 'SECTION_END',
-'TEXT',
-'PRE',
 'HLINE',
 'SIGNATURE_NAME',
 'SIGNATURE_DATE',
 'SIGNATURE_FULL',
+'PARA_START',
+'PARA_END',
 'UL_START',
 'UL_END',
-'LI_START',
-'LI_END',
 'OL_START',
 'OL_END',
+'LI_START',
+'LI_END',
+'DL_START',
+'DL_END',
+'DT_START',
+'DT_END',
+'DD_START',
+'DD_END',
+'TAG_START',
+'TAG_END',
+'ATTR_NAME',
+'ATTR_VALUE',
 'TABLE_START',
 'TABLE_END',
 'ROW_START',
@@ -371,8 +637,12 @@ Racc_token_to_s_table = [
 'HEAD_END',
 'CELL_START',
 'CELL_END',
-'PARA_START',
-'PARA_END',
+'KEYWORD',
+'TEMPLATE_START',
+'TEMPLATE_END',
+'CATEGORY',
+'PASTE_START',
+'PASTE_END',
 '$start',
 'wiki',
 'repeated_contents',
@@ -380,13 +650,18 @@ Racc_token_to_s_table = [
 'text',
 'bulleted_list',
 'numbered_list',
+'dictionary_list',
 'preformatted',
 'section',
+'tag',
+'template',
 'para_contents',
 'link_contents',
 'reslink_repeated_contents',
 'intlink_repeated_contents',
+'cat_sort_contents',
 'table',
+'tag_attributes',
 'link_repeated_contents',
 'element',
 'formatted_element',
@@ -394,7 +669,11 @@ Racc_token_to_s_table = [
 'row_contents',
 'list_item',
 'list_contents',
-'@1']
+'@1',
+'dictionary_term',
+'dictionary_contents',
+'dictionary_definition',
+'template_parameters']
 
 Racc_debug_parser = false
 
@@ -402,9 +681,9 @@ Racc_debug_parser = false
 
  # reduce 0 omitted
 
-module_eval <<'.,.,', 'mediawikiparser.y', 29
+module_eval <<'.,.,', 'mediawikiparser.y', 30
   def _reduce_1( val, _values, result )
-            @nodes.push WikiAST.new
+            @nodes.push WikiAST.new(0, @wiki_ast_length)
             #@nodes.last.children.insert(0, val[0])
             #puts val[0]
             @nodes.last.children += val[0]
@@ -412,57 +691,87 @@ module_eval <<'.,.,', 'mediawikiparser.y', 29
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 36
+module_eval <<'.,.,', 'mediawikiparser.y', 37
   def _reduce_2( val, _values, result )
             result = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 40
+module_eval <<'.,.,', 'mediawikiparser.y', 41
   def _reduce_3( val, _values, result )
             result = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 44
+module_eval <<'.,.,', 'mediawikiparser.y', 45
   def _reduce_4( val, _values, result )
             result = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 50
+module_eval <<'.,.,', 'mediawikiparser.y', 52
   def _reduce_5( val, _values, result )
-            p = PreformattedAST.new
-            p.contents = val[0]
-            result = p
+            list = ListAST.new(@ast_index, @ast_length)
+            list.list_type = :Dictionary
+            list.children = val[0]
+            result = list
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 54
+module_eval <<'.,.,', 'mediawikiparser.y', 56
   def _reduce_6( val, _values, result )
             result = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 62
+module_eval <<'.,.,', 'mediawikiparser.y', 60
   def _reduce_7( val, _values, result )
-            if val[1]
-                p = ParagraphAST.new
-                p.children = val[1]
-                result = p
-            end
+            result = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 69
+module_eval <<'.,.,', 'mediawikiparser.y', 64
   def _reduce_8( val, _values, result )
-            l = LinkAST.new
+            result = val[0]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 68
+  def _reduce_9( val, _values, result )
+            result = val[0]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 74
+  def _reduce_10( val, _values, result )
+            k = KeywordAST.new(@ast_index, @ast_length)
+            k.text = val[0]
+            result = k
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 80
+  def _reduce_11( val, _values, result )
+            p = ParagraphAST.new(@ast_index, @ast_length)
+            p.children = val[1]
+            result = p
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 88
+  def _reduce_12( val, _values, result )
+            l = LinkAST.new(@ast_index, @ast_length)
+            l.link_type = val[0]
             l.url = val[1][0]
             l.children += val[1][1..-1] if val[1].length > 1
             result = l
@@ -470,9 +779,18 @@ module_eval <<'.,.,', 'mediawikiparser.y', 69
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 77
-  def _reduce_9( val, _values, result )
-            l = ResourceLinkAST.new
+module_eval <<'.,.,', 'mediawikiparser.y', 94
+  def _reduce_13( val, _values, result )
+            p = PasteAST.new(@ast_index, @ast_length)
+            p.children = val[1]
+            result = p
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 102
+  def _reduce_14( val, _values, result )
+            l = ResourceLinkAST.new(@ast_index, @ast_length)
             l.prefix = val[1]
             l.locator = val[3]
             l.children = val[4] unless val[4].nil? or val[4].empty?
@@ -481,9 +799,9 @@ module_eval <<'.,.,', 'mediawikiparser.y', 77
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 84
-  def _reduce_10( val, _values, result )
-            l = InternalLinkAST.new
+module_eval <<'.,.,', 'mediawikiparser.y', 109
+  def _reduce_15( val, _values, result )
+            l = InternalLinkAST.new(@ast_index, @ast_length)
             l.locator = val[1]
             l.children = val[2] unless val[2].nil? or val[2].empty?
             result = l
@@ -491,83 +809,169 @@ module_eval <<'.,.,', 'mediawikiparser.y', 84
   end
 .,.,
 
- # reduce 11 omitted
+module_eval <<'.,.,', 'mediawikiparser.y', 116
+  def _reduce_16( val, _values, result )
+            l = CategoryAST.new(@ast_index, @ast_length)
+            l.locator = val[2]
+            l.sort_as = val[3]
+            result = l
+   result
+  end
+.,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 92
-  def _reduce_12( val, _values, result )
+module_eval <<'.,.,', 'mediawikiparser.y', 123
+  def _reduce_17( val, _values, result )
+            l = CategoryLinkAST.new(@ast_index, @ast_length)
+            l.locator = val[3]
+            l.children = val[4] unless val[4].nil? or val[4].empty?
+            result = l
+   result
+  end
+.,.,
+
+ # reduce 18 omitted
+
+module_eval <<'.,.,', 'mediawikiparser.y', 130
+  def _reduce_19( val, _values, result )
             result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 96
-  def _reduce_13( val, _values, result )
+module_eval <<'.,.,', 'mediawikiparser.y', 134
+  def _reduce_20( val, _values, result )
             result = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 103
-  def _reduce_14( val, _values, result )
+module_eval <<'.,.,', 'mediawikiparser.y', 147
+  def _reduce_21( val, _values, result )
+            if val[0] != val[2] 
+                raise Racc::ParseError.new("XHTML end tag #{val[2]} does not match start tag #{val[0]}")
+            end
+            elem = ElementAST.new(@ast_index, @ast_length)
+            elem.name = val[0]
+            elem.attributes = val[1]
+            result = elem
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 158
+  def _reduce_22( val, _values, result )
+            if val[0] != val[3] 
+                raise Racc::ParseError.new("XHTML end tag #{val[3]} does not match start tag #{val[0]}")
+            end
+            elem = ElementAST.new(@ast_index, @ast_length)
+            elem.name = val[0]
+            elem.attributes = val[1]
+            elem.children += val[2]
+            result = elem
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 164
+  def _reduce_23( val, _values, result )
+            result = nil
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 170
+  def _reduce_24( val, _values, result )
+            attr_map = val[2] ? val[2] : {}
+            attr_map[val[0]] = true
+            result = attr_map
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 176
+  def _reduce_25( val, _values, result )
+            attr_map = val[2] ? val[2] : {}
+            attr_map[val[0]] = val[1]
+            result = attr_map
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 184
+  def _reduce_26( val, _values, result )
             result = val
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 108
-  def _reduce_15( val, _values, result )
+module_eval <<'.,.,', 'mediawikiparser.y', 189
+  def _reduce_27( val, _values, result )
             result = [val[0]]
             result += val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 116
-  def _reduce_16( val, _values, result )
+module_eval <<'.,.,', 'mediawikiparser.y', 197
+  def _reduce_28( val, _values, result )
             result = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 121
-  def _reduce_17( val, _values, result )
+module_eval <<'.,.,', 'mediawikiparser.y', 202
+  def _reduce_29( val, _values, result )
             result = val[0]
             result += val[2] if val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 128
-  def _reduce_18( val, _values, result )
+module_eval <<'.,.,', 'mediawikiparser.y', 209
+  def _reduce_30( val, _values, result )
             result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 132
-  def _reduce_19( val, _values, result )
+module_eval <<'.,.,', 'mediawikiparser.y', 213
+  def _reduce_31( val, _values, result )
             result = val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 138
-  def _reduce_20( val, _values, result )
+module_eval <<'.,.,', 'mediawikiparser.y', 219
+  def _reduce_32( val, _values, result )
             result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 142
-  def _reduce_21( val, _values, result )
+module_eval <<'.,.,', 'mediawikiparser.y', 223
+  def _reduce_33( val, _values, result )
             result = val[1]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 149
-  def _reduce_22( val, _values, result )
-            i = InternalLinkItemAST.new
+module_eval <<'.,.,', 'mediawikiparser.y', 229
+  def _reduce_34( val, _values, result )
+            result = nil
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 233
+  def _reduce_35( val, _values, result )
+            result = val[1]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 240
+  def _reduce_36( val, _values, result )
+            i = InternalLinkItemAST.new(@ast_index, @ast_length)
             i.children = val[1]
             result = [i]
             result += val[2] if val[2]
@@ -575,16 +979,16 @@ module_eval <<'.,.,', 'mediawikiparser.y', 149
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 156
-  def _reduce_23( val, _values, result )
+module_eval <<'.,.,', 'mediawikiparser.y', 247
+  def _reduce_37( val, _values, result )
             result = []
             result << val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 162
-  def _reduce_24( val, _values, result )
+module_eval <<'.,.,', 'mediawikiparser.y', 253
+  def _reduce_38( val, _values, result )
             result = []
             result += val[0]
             result << val[1]
@@ -592,9 +996,9 @@ module_eval <<'.,.,', 'mediawikiparser.y', 162
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 171
-  def _reduce_25( val, _values, result )
-            p = TextAST.new
+module_eval <<'.,.,', 'mediawikiparser.y', 262
+  def _reduce_39( val, _values, result )
+            p = TextAST.new(@ast_index, @ast_length)
             p.formatting = val[0][0]
             p.contents = val[0][1]
             result = p
@@ -602,25 +1006,25 @@ module_eval <<'.,.,', 'mediawikiparser.y', 171
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 175
-  def _reduce_26( val, _values, result )
+module_eval <<'.,.,', 'mediawikiparser.y', 266
+  def _reduce_40( val, _values, result )
             result = val[0]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 184
-  def _reduce_27( val, _values, result )
-            table = TableAST.new
+module_eval <<'.,.,', 'mediawikiparser.y', 275
+  def _reduce_41( val, _values, result )
+            table = TableAST.new(@ast_index, @ast_length)
             table.children = val[1] unless val[1].nil? or val[1].empty?
             result = table
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 191
-  def _reduce_28( val, _values, result )
-            table = TableAST.new
+module_eval <<'.,.,', 'mediawikiparser.y', 282
+  def _reduce_42( val, _values, result )
+            table = TableAST.new(@ast_index, @ast_length)
             table.options = val[1]
             table.children = val[2] unless val[2].nil? or val[2].empty?
             result = table
@@ -628,16 +1032,16 @@ module_eval <<'.,.,', 'mediawikiparser.y', 191
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 196
-  def _reduce_29( val, _values, result )
+module_eval <<'.,.,', 'mediawikiparser.y', 287
+  def _reduce_43( val, _values, result )
             result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 203
-  def _reduce_30( val, _values, result )
-            row = TableRowAST.new
+module_eval <<'.,.,', 'mediawikiparser.y', 294
+  def _reduce_44( val, _values, result )
+            row = TableRowAST.new(@ast_index, @ast_length)
             row.children = val[1] unless val[1].nil? or val[1].empty?
             result = [row]
             result += val[3] unless val[3].nil? or val[3].empty?
@@ -645,9 +1049,9 @@ module_eval <<'.,.,', 'mediawikiparser.y', 203
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 211
-  def _reduce_31( val, _values, result )
-            row = TableRowAST.new
+module_eval <<'.,.,', 'mediawikiparser.y', 302
+  def _reduce_45( val, _values, result )
+            row = TableRowAST.new(@ast_index, @ast_length)
             row.children = val[2] unless val[2].nil? or val[2].empty?
             row.options = val[1]
             result = [row]
@@ -656,16 +1060,16 @@ module_eval <<'.,.,', 'mediawikiparser.y', 211
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 216
-  def _reduce_32( val, _values, result )
+module_eval <<'.,.,', 'mediawikiparser.y', 307
+  def _reduce_46( val, _values, result )
             result = nil
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 223
-  def _reduce_33( val, _values, result )
-            cell = TableCellAST.new
+module_eval <<'.,.,', 'mediawikiparser.y', 314
+  def _reduce_47( val, _values, result )
+            cell = TableCellAST.new(@ast_index, @ast_length)
             cell.type = :head
             result = [cell]
             result += val[2] unless val[2].nil? or val[2].empty?
@@ -673,9 +1077,9 @@ module_eval <<'.,.,', 'mediawikiparser.y', 223
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 231
-  def _reduce_34( val, _values, result )
-            cell = TableCellAST.new
+module_eval <<'.,.,', 'mediawikiparser.y', 322
+  def _reduce_48( val, _values, result )
+            cell = TableCellAST.new(@ast_index, @ast_length)
             cell.children = val[1] unless val[1].nil? or val[1].empty?
             cell.type = :head
             result = [cell]
@@ -684,9 +1088,9 @@ module_eval <<'.,.,', 'mediawikiparser.y', 231
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 238
-  def _reduce_35( val, _values, result )
-            cell = TableCellAST.new
+module_eval <<'.,.,', 'mediawikiparser.y', 329
+  def _reduce_49( val, _values, result )
+            cell = TableCellAST.new(@ast_index, @ast_length)
             cell.type = :body
             result = [cell]
             result += val[2] unless val[2].nil? or val[2].empty?
@@ -694,73 +1098,88 @@ module_eval <<'.,.,', 'mediawikiparser.y', 238
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 246
-  def _reduce_36( val, _values, result )
-            cell = TableCellAST.new
-            cell.children = val[1] unless val[1].nil? or val[1].empty?
-            cell.type = :body
-            result = [cell]
+module_eval <<'.,.,', 'mediawikiparser.y', 345
+  def _reduce_50( val, _values, result )
+            if val[2] == 'attributes'
+                result = []
+            else
+                cell = TableCellAST.new(@ast_index, @ast_length)
+                cell.children = val[1] unless val[1].nil? or val[1].empty?
+                cell.type = :body
+                result = [cell]
+            end
             result += val[3] unless val[3].nil? or val[3].empty?
+            if val[2] == 'attributes' and val[3] and val[3].first.class == TableCellAST
+                val[3].first.attributes = val[1]
+            end
+            result
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 250
-  def _reduce_37( val, _values, result )
+module_eval <<'.,.,', 'mediawikiparser.y', 349
+  def _reduce_51( val, _values, result )
  return [:None, val[0]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 252
-  def _reduce_38( val, _values, result )
+module_eval <<'.,.,', 'mediawikiparser.y', 351
+  def _reduce_52( val, _values, result )
  return [:HLine, val[0]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 254
-  def _reduce_39( val, _values, result )
+module_eval <<'.,.,', 'mediawikiparser.y', 353
+  def _reduce_53( val, _values, result )
+ return [:CharacterEntity, val[0]]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 355
+  def _reduce_54( val, _values, result )
  return [:SignatureDate, val[0]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 256
-  def _reduce_40( val, _values, result )
+module_eval <<'.,.,', 'mediawikiparser.y', 357
+  def _reduce_55( val, _values, result )
  return [:SignatureName, val[0]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 258
-  def _reduce_41( val, _values, result )
+module_eval <<'.,.,', 'mediawikiparser.y', 359
+  def _reduce_56( val, _values, result )
  return [:SignatureFull, val[0]]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 268
-  def _reduce_42( val, _values, result )
-            result = FormattedAST.new
+module_eval <<'.,.,', 'mediawikiparser.y', 369
+  def _reduce_57( val, _values, result )
+            result = FormattedAST.new(@ast_index, @ast_length)
             result.formatting = :Bold
             result
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 274
-  def _reduce_43( val, _values, result )
-            result = FormattedAST.new
+module_eval <<'.,.,', 'mediawikiparser.y', 375
+  def _reduce_58( val, _values, result )
+            result = FormattedAST.new(@ast_index, @ast_length)
             result.formatting = :Italic
             result
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 281
-  def _reduce_44( val, _values, result )
-            p = FormattedAST.new
+module_eval <<'.,.,', 'mediawikiparser.y', 382
+  def _reduce_59( val, _values, result )
+            p = FormattedAST.new(@ast_index, @ast_length)
             p.formatting = :Bold
             p.children += val[1]
             result = p
@@ -768,9 +1187,9 @@ module_eval <<'.,.,', 'mediawikiparser.y', 281
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 288
-  def _reduce_45( val, _values, result )
-            p = FormattedAST.new
+module_eval <<'.,.,', 'mediawikiparser.y', 389
+  def _reduce_60( val, _values, result )
+            p = FormattedAST.new(@ast_index, @ast_length)
             p.formatting = :Italic
             p.children += val[1]
             result = p
@@ -778,9 +1197,9 @@ module_eval <<'.,.,', 'mediawikiparser.y', 288
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 298
-  def _reduce_46( val, _values, result )
-            list = ListAST.new
+module_eval <<'.,.,', 'mediawikiparser.y', 399
+  def _reduce_61( val, _values, result )
+            list = ListAST.new(@ast_index, @ast_length)
             list.list_type = :Bulleted
             list.children << val[1]
             list.children += val[2]
@@ -789,9 +1208,9 @@ module_eval <<'.,.,', 'mediawikiparser.y', 298
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 308
-  def _reduce_47( val, _values, result )
-            list = ListAST.new
+module_eval <<'.,.,', 'mediawikiparser.y', 409
+  def _reduce_62( val, _values, result )
+            list = ListAST.new(@ast_index, @ast_length)
             list.list_type = :Numbered
             list.children << val[1]
             list.children += val[2]
@@ -800,55 +1219,129 @@ module_eval <<'.,.,', 'mediawikiparser.y', 308
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 311
-  def _reduce_48( val, _values, result )
+module_eval <<'.,.,', 'mediawikiparser.y', 412
+  def _reduce_63( val, _values, result )
  result = []
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 317
-  def _reduce_49( val, _values, result )
+module_eval <<'.,.,', 'mediawikiparser.y', 418
+  def _reduce_64( val, _values, result )
             result << val[1]
             result += val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 318
-  def _reduce_50( val, _values, result )
+module_eval <<'.,.,', 'mediawikiparser.y', 419
+  def _reduce_65( val, _values, result )
  result = []
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 326
-  def _reduce_51( val, _values, result )
-            result = ListItemAST.new
+module_eval <<'.,.,', 'mediawikiparser.y', 427
+  def _reduce_66( val, _values, result )
+            result = ListItemAST.new(@ast_index, @ast_length)
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 332
-  def _reduce_52( val, _values, result )
-            li = ListItemAST.new
+module_eval <<'.,.,', 'mediawikiparser.y', 433
+  def _reduce_67( val, _values, result )
+            li = ListItemAST.new(@ast_index, @ast_length)
             li.children += val[1]
             result = li
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 335
-  def _reduce_53( val, _values, result )
- result = val[0]
+module_eval <<'.,.,', 'mediawikiparser.y', 441
+  def _reduce_68( val, _values, result )
+            result = [val[1]]
+            result += val[2]
    result
   end
 .,.,
 
-module_eval <<'.,.,', 'mediawikiparser.y', 344
-  def _reduce_54( val, _values, result )
+module_eval <<'.,.,', 'mediawikiparser.y', 445
+  def _reduce_69( val, _values, result )
+            result = val[1]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 452
+  def _reduce_70( val, _values, result )
+            result = ListTermAST.new(@ast_index, @ast_length)
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 458
+  def _reduce_71( val, _values, result )
+            term = ListTermAST.new(@ast_index, @ast_length)
+            term.children += val[1]
+            result = term
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 465
+  def _reduce_72( val, _values, result )
+            result = [val[0]]
+            result += val[1] if val[1]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 469
+  def _reduce_73( val, _values, result )
+            result = []
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 475
+  def _reduce_74( val, _values, result )
+            result = ListDefinitionAST.new(@ast_index, @ast_length)
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 481
+  def _reduce_75( val, _values, result )
+            term = ListDefinitionAST.new(@ast_index, @ast_length)
+            term.children += val[1]
+            result = term
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 488
+  def _reduce_76( val, _values, result )
+            p = PreformattedAST.new(@ast_index, @ast_length)
+            p.children += val[1]
+            result = p
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 495
+  def _reduce_77( val, _values, result )
+            p = PreformattedAST.new(@ast_index, @ast_length)
+            p.indented = true
+            p.children += val[1]
+            result = p
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 503
+  def _reduce_78( val, _values, result )
  result = [val[1], val[0].length] 
-            s = SectionAST.new
+            s = SectionAST.new(@ast_index, @ast_length)
             s.children = val[1]
             s.level = val[0].length
             result = s
@@ -856,6 +1349,43 @@ module_eval <<'.,.,', 'mediawikiparser.y', 344
   end
 .,.,
 
+module_eval <<'.,.,', 'mediawikiparser.y', 513
+  def _reduce_79( val, _values, result )
+            t = TemplateAST.new(@ast_index, @ast_length)
+            t.template_name = val[1]
+            t.children = val[2] unless val[2].nil? or val[2].empty?
+            result = t
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 519
+  def _reduce_80( val, _values, result )
+            result = nil
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 526
+  def _reduce_81( val, _values, result )
+            p = TemplateParameterAST.new(@ast_index, @ast_length)
+            p.parameter_value = val[1]
+            result = [p]
+            result += val[2] if val[2]
+   result
+  end
+.,.,
+
+module_eval <<'.,.,', 'mediawikiparser.y', 533
+  def _reduce_82( val, _values, result )
+            p = TemplateParameterAST.new(@ast_index, @ast_length)
+            p.children << val[1]
+            result = [p]
+            result += val[2] if val[2]
+   result
+  end
+.,.,
+
  def _reduce_none( val, _values, result )
   result
  end