depager 0.1.9 → 0.2.0

data/lib/depager/slex.rb

@@ -61,30 +61,45 @@ class StatefulLexerExtension #:nodoc:all
   def postRhs
     j = 0
     rhs = g_parser.rhs
-    @ins.each do |i, m|
+    @ins.each do |i, option_list, debug|
       state_name = "#{lhs_name}_#{nrhs}_#{i}"
+      m_name     = "_lex_#{state_name}"
       if i != rhs.size
-        isym     = g_parser.add_nonterm("__#{state_name}__".intern)
-        new_rule = Rule[isym, []]
-        val      = ( ":_lex_#{state_name}" )
-        @addition << [ new_rule, rhs, val, i+j, isym ]
+        nt_name  = "__#{state_name}__"
+        isym     = g_parser.add_nonterm(nt_name)
+        g_parser.rhs_insert_sym(i+j, isym, nt_name)
+        @addition << [ isym, m_name ]
         j += 1
       else
-        @on_reduce[nrules] = ( ":_lex_#{state_name}" )
+        @on_reduce[nrules] = ':'+m_name
+      end
+
+      codes = option_list.map do |k, m|
+        case k
+        when :GOTO
+          "@basis.lex_state = #{m}" <<
+            (debug ? ";warn 'MODE:->#{m}'" : '')
+        when :ADD 
+          "@basis.lex_context[#{m}] = true" <<
+            (debug ? ";warn 'CONTEXT:+#{m}/\#{@context.inspect}'" : '')
+        when :SUB
+          "@basis.lex_context.delete #{m}" <<
+            (debug ? ";warn 'CONTEXT:-#{m}'/\#{@context.inspect}" : '')
+        else
+        end
       end
       @optouter.push << %{
-        def _lex_#{lhs_name}_#{nrhs}_#{i} val
-          @basis.lex_state = #{m}
+        def #{m_name} val
+          #{codes.join("\n          ")}
         end
       }
     end
     @ins.clear
   end
   def postRhsList
-    @addition.each do |new_rule, rhs, val, pos, isym|      
-      g_parser.g << new_rule
-      rhs.insert(pos, isym)
-      @on_reduce[nrules] = val
+    @addition.each do |isym, m_name|  
+      g_parser.add_rule isym, []
+      @on_reduce[nrules] = ':'+m_name
     end
     @addition.clear
   end
@@ -99,7 +114,7 @@ end
 module D4StatefulLexerExtension_prerulelist #:nodoc:all
 end
 
-class StatefulLexerExtension_prerulelist < Basis #:nodoc:all
+class StatefulLexerExtension_prerulelist < Depager::LALR::Basis #:nodoc:all
   include Depager::ExtensionUtils
   
   include ActionParser
@@ -115,7 +130,9 @@ class StatefulLexerExtension_prerulelist < Basis #:nodoc:all
     [ 4, 2 ],
     [ 3, 1 ],
     [ 3, 2 ],
-    [ 5, 2 ],
+    [ 5, 3 ],
+    [ 7, 0 ],
+    [ 7, 1 ],
     [ 6, 1 ],
     [ 6, 3 ],
   ]
@@ -132,8 +149,9 @@ class StatefulLexerExtension_prerulelist < Basis #:nodoc:all
     ">" => 4, 
     ":" => 5, 
     :ACTION => 6, 
-    :LEX => 7, 
-    "," => 8, 
+    "!" => 7, 
+    :LEX => 8, 
+    "," => 9, 
   }
   ### Int to Term
   i2t = [
@@ -144,29 +162,32 @@ class StatefulLexerExtension_prerulelist < Basis #:nodoc:all
     ">", 
     ":", 
     :ACTION, 
+    "!", 
     :LEX, 
     ",", 
   ]
   ### Action Table
   action_table = [
-    [ nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
-    [ ACC, nil, nil, nil, nil, nil, nil, nil, nil, ], 
-    [ nil, nil, 4, nil, nil, nil, nil, nil, nil, ], 
-    [ nil, nil, nil, nil, nil, nil, nil, 7, nil, ], 
-    [ nil, nil, nil, 9, nil, nil, nil, nil, nil, ], 
-    [ nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
-    [ nil, nil, nil, nil, nil, nil, 11, nil, 10, ], 
-    [ nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
-    [ nil, nil, nil, nil, nil, nil, nil, 7, nil, ], 
-    [ nil, nil, nil, nil, nil, 14, nil, nil, nil, ], 
-    [ nil, nil, nil, nil, nil, nil, nil, 15, nil, ], 
-    [ nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
-    [ nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
-    [ nil, nil, nil, nil, 16, nil, nil, nil, nil, ], 
-    [ nil, nil, nil, 17, nil, nil, nil, nil, nil, ], 
-    [ nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
-    [ nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
-    [ nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
+    [ ACC, nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, 3, nil, nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, 5, nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, nil, nil, 6, nil, ], 
+    [ nil, nil, nil, nil, nil, 11, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, nil, 12, nil, 13, ], 
+    [ nil, nil, nil, nil, nil, nil, nil, nil, 6, nil, ], 
+    [ nil, nil, nil, nil, 16, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, 17, nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, nil, nil, 18, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, 19, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
   ]
   ### Default Reduce Table
   defred_table = [
@@ -175,19 +196,21 @@ class StatefulLexerExtension_prerulelist < Basis #:nodoc:all
     -1, 
     nil, 
     nil, 
+    -5, 
+    -12, 
     -7, 
-    nil, 
     -10, 
     -3, 
-    -5, 
-    nil, 
-    -9, 
-    -8, 
     nil, 
     nil, 
     -11, 
+    nil, 
+    nil, 
+    -8, 
     -4, 
     -6, 
+    -13, 
+    -9, 
   ]
   defred_after_shift_table = [
     -2, 
@@ -195,19 +218,21 @@ class StatefulLexerExtension_prerulelist < Basis #:nodoc:all
     nil, 
     nil, 
     nil, 
+    nil, 
+    -12, 
     -7, 
     nil, 
-    -10, 
     nil, 
     nil, 
     nil, 
-    -9, 
-    -8, 
+    -11, 
     nil, 
     nil, 
-    -11, 
+    -8, 
     -4, 
     -6, 
+    -13, 
+    -9, 
   ]
   ### Nonterm to Int
   nt2i = { 
@@ -217,7 +242,8 @@ class StatefulLexerExtension_prerulelist < Basis #:nodoc:all
     :lexactlist => 3,  
     :opt_super => 4,  
     :lexact => 5,  
-    :lexlist => 6, 
+    :lexlist => 6,  
+    :opt_noskip => 7, 
   }
   ### Int to Nonterm
   i2nt = [
@@ -228,27 +254,30 @@ class StatefulLexerExtension_prerulelist < Basis #:nodoc:all
     :opt_super, 
     :lexact, 
     :lexlist, 
+    :opt_noskip, 
   ]
   ### Goto Table
   goto_table = [ 
-   [ 1, 2, nil, nil, nil, nil, nil, ], 
-   [ nil, nil, nil, nil, nil, nil, nil, ], 
-   [ nil, nil, 3, nil, nil, nil, nil, ], 
-   [ nil, nil, nil, 8, nil, 5, 6, ], 
-   [ nil, nil, nil, nil, nil, nil, nil, ], 
-   [ nil, nil, nil, nil, nil, nil, nil, ], 
-   [ nil, nil, nil, nil, nil, nil, nil, ], 
-   [ nil, nil, nil, nil, nil, nil, nil, ], 
-   [ nil, nil, nil, nil, nil, 12, 6, ], 
-   [ nil, nil, nil, nil, 13, nil, nil, ], 
-   [ nil, nil, nil, nil, nil, nil, nil, ], 
-   [ nil, nil, nil, nil, nil, nil, nil, ], 
-   [ nil, nil, nil, nil, nil, nil, nil, ], 
-   [ nil, nil, nil, nil, nil, nil, nil, ], 
-   [ nil, nil, nil, nil, nil, nil, nil, ], 
-   [ nil, nil, nil, nil, nil, nil, nil, ], 
-   [ nil, nil, nil, nil, nil, nil, nil, ], 
-   [ nil, nil, nil, nil, nil, nil, nil, ], 
+   [ 1, 2, nil, nil, nil, nil, nil, nil, ], 
+   [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
+   [ nil, nil, 4, nil, nil, nil, nil, nil, ], 
+   [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
+   [ nil, nil, nil, 9, nil, 7, 8, nil, ], 
+   [ nil, nil, nil, nil, 10, nil, nil, nil, ], 
+   [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
+   [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
+   [ nil, nil, nil, nil, nil, nil, nil, 14, ], 
+   [ nil, nil, nil, nil, nil, 15, 8, nil, ], 
+   [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
+   [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
+   [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
+   [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
+   [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
+   [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
+   [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
+   [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
+   [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
+   [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
   ]
 
   Tables = [ reduce_table, nparams, action_table,
@@ -284,28 +313,52 @@ class StatefulLexerExtension_prerulelist < Basis #:nodoc:all
 
           def lex
             begin
-              until @line.empty? do
+              until @line.empty?
                 case @line
-                  when /\A\s+/, /\A#.*\Z/
-     
-when /\A[A-Z]+/
-     yield _Token(:ID, $&) 
-when /\A\%\}\s*\Z/
-     @line = $'; yield nil,nil 
-when /\A\/(([^\/\\]+|\\.)*)\//, /\A'([^'\\]+|\\.)*\'/
-     yield _Token(:LEX, "/\\A#{$1}/") 
-when /\A\{/
-     ln = lineno; yield :ACTION, Token[parse_action, ln]; //=~'' 
-when /\A./
-     yield _Token($&, $&) 
+                
+          when /\A\s+/, /\A#.*\Z/
+            @oldline = @line; @line = $'
+                 
+
+        
+          when /\A[A-Z]+/
+            @oldline = @line; @line = $'
+                 yield _Token(:ID, $&) 
+
+        
+          when /\A\%\}\s*\Z/
+            @oldline = @line; @line = $'
+                 yield nil,nil 
+
+        
+          when /\A\/(([^\/\\]+|\\.)*)\//
+            @oldline = @line; @line = $'
+                 yield _Token(:LEX, "/\\A#{$1}/") 
+
+        
+          when /\A'([^'\\]+|\\.)*'/, /\A"([^"\\]+|\\.)*"/
+            @oldline = @line; @line = $'
+             
+    yield _Token(:LEX, "/\\A#{Regexp.escape($1).gsub('/', '\/')}/")
+
+        
+          when /\A\{/
+            #
+             
+    _lineno = lineno
+    yield _Token(:ACTION, parse_action, _lineno)
+
+        
+          when /\A./
+            @oldline = @line; @line = $'
+                 yield _Token($&, $&) 
 
+        
                 else
                   raise RuntimeError, "must not happen #{@line}"
                 end
-                @oldline = @line
-                @line = $'
               end
-            end while @line = getline
+            end while @line0 = @line = getline
             yield nil, nil
           end
         
@@ -313,7 +366,7 @@ end
 
 ### Outer Code
 
-class D4StatefulLexerExtension_prerulelist::NVAction < Depager::Action #:nodoc:all
+class D4StatefulLexerExtension_prerulelist::NVAction < Depager::LALR::Action #:nodoc:all
   include Depager::DecoratorUtils
           include ActionParser
 
@@ -330,6 +383,8 @@ class D4StatefulLexerExtension_prerulelist::NVAction < Depager::Action #:nodoc:a
   :_act_8,
   :_act_9,
   :_act_10,
+  :_act_11,
+  :_act_12,
 
   ]
   Tables = [on_reduce]
@@ -340,138 +395,154 @@ class D4StatefulLexerExtension_prerulelist::NVAction < Depager::Action #:nodoc:a
   end
   
 
-module_eval <<-'.,.,118028145945879.,.,', 'slex.dr', 73
+module_eval <<-'.,.,118754107818868.,.,', 'slex.dr', 96
   def _act_0 val
     _mode_list = *val 
 
         ll = ''
         _mode_list.each do |m, s, l|
-          elsec = if s
-                    "_rest = lex_#{s}(&block)"
-                  else
-                    %!raise RuntimeError, "must not happen \#{@line}"!
-                  end
+          else_code = if s
+                        "lex_#{s}(&block)"
+                      else
+                        'raise RuntimeError, "must not happen #{@line}"'
+                      end
           ll << %{
             def lex_#{m}(&block)
-              _rest = ''
               case @line
                 #{l.map{|i| ' '*4+i}}
               else
-                #{elsec}
+                #{else_code}
               end
-              return _rest
             end
           }; #code
         end
         g_parser.optinner << ll << %{
-          attr_accessor :lex_state
+          attr_accessor :lex_state, :lex_context
           def lex(&block)
-            @lex_state ||= :START
+            @lex_state   ||= :START
+            @lex_context ||= {}
             begin
               until @line.empty?
-                @line = self.send "lex_\#{@lex_state}", &block
+                self.send "lex_\#{@lex_state}", &block
               end
-            end while @line = getline
+            end while @line0 = @line = getline
             yield nil, nil
           end
         }; #code
 
   end
 
-.,.,118028145945879.,.,
+.,.,118754107818868.,.,
       
-module_eval <<-'.,.,118028145964322.,.,', 'slex.dr', 108
+module_eval <<-'.,.,118754107863583.,.,', 'slex.dr', 130
   def _act_1 val
      [ ] 
 
   end
 
-.,.,118028145964322.,.,
+.,.,118754107863583.,.,
       
-module_eval <<-'.,.,118028145964390.,.,', 'slex.dr', 109
+module_eval <<-'.,.,118754107817072.,.,', 'slex.dr', 131
   def _act_2 val
     _mode_list, _mode, _lexactlist = *val 
      _mode_list << [_mode[0], _mode[1], _lexactlist] 
 
   end
 
-.,.,118028145964390.,.,
+.,.,118754107817072.,.,
       
-module_eval <<-'.,.,118028145932066.,.,', 'slex.dr', 112
+module_eval <<-'.,.,118754107816434.,.,', 'slex.dr', 134
   def _act_3 val
     _, _ID, _opt_super, _ = *val 
      [ _ID.value, _opt_super ] 
 
   end
 
-.,.,118028145932066.,.,
+.,.,118754107816434.,.,
       
-module_eval <<-'.,.,118028145910814.,.,', 'slex.dr', 115
+module_eval <<-'.,.,118754107840777.,.,', 'slex.dr', 137
   def _act_4 val
      nil 
 
   end
 
-.,.,118028145910814.,.,
+.,.,118754107840777.,.,
       
-module_eval <<-'.,.,118028145954649.,.,', 'slex.dr', 116
+module_eval <<-'.,.,118754107819808.,.,', 'slex.dr', 138
   def _act_5 val
     _, _ID = *val 
      _ID.value 
 
   end
 
-.,.,118028145954649.,.,
+.,.,118754107819808.,.,
       
-module_eval <<-'.,.,118028145953818.,.,', 'slex.dr', 119
+module_eval <<-'.,.,118754107825523.,.,', 'slex.dr', 141
   def _act_6 val
     _lexact = *val 
      [ _lexact ] 
 
   end
 
-.,.,118028145953818.,.,
+.,.,118754107825523.,.,
       
-module_eval <<-'.,.,118028145941830.,.,', 'slex.dr', 120
+module_eval <<-'.,.,11875410787826.,.,', 'slex.dr', 142
   def _act_7 val
     _lexactlist, _lexact = *val 
      _lexactlist << _lexact 
 
   end
 
-.,.,118028145941830.,.,
+.,.,11875410787826.,.,
       
-module_eval <<-'.,.,11802814599495.,.,', 'slex.dr', 124
+module_eval <<-'.,.,118754107820340.,.,', 'slex.dr', 146
   def _act_8 val
-    _lexlist, _ACTION = *val 
+    _lexlist, _opt_noskip, _ACTION = *val 
 
         %{
           when #{_lexlist.join(', ')}
-            _rest = $'
+            #{ _opt_noskip ? '#' : "@oldline = @line; @line = $'" }
             #{ _ACTION.value }
         }; #code
 
   end
 
-.,.,11802814599495.,.,
+.,.,118754107820340.,.,
       
-module_eval <<-'.,.,118028145922938.,.,', 'slex.dr', 133
+module_eval <<-'.,.,118754107818518.,.,', 'slex.dr', 155
   def _act_9 val
+     false 
+
+  end
+
+.,.,118754107818518.,.,
+      
+module_eval <<-'.,.,118754107850066.,.,', 'slex.dr', 156
+  def _act_10 val
+    _ = *val 
+     true  
+
+  end
+
+.,.,118754107850066.,.,
+      
+module_eval <<-'.,.,118754107825362.,.,', 'slex.dr', 159
+  def _act_11 val
     _LEX = *val 
      [ _LEX.value ] 
 
   end
 
-.,.,118028145922938.,.,
+.,.,118754107825362.,.,
       
-module_eval <<-'.,.,11802814594078.,.,', 'slex.dr', 134
-  def _act_10 val
+module_eval <<-'.,.,118754107856852.,.,', 'slex.dr', 160
+  def _act_12 val
     _lexlist, _, _LEX = *val 
      _lexlist.push _LEX 
 
   end
 
-.,.,11802814594078.,.,
+.,.,118754107856852.,.,
       
 end
       
@@ -482,14 +553,20 @@ end
 module D4StatefulLexerExtension_prerhs_postsymbol #:nodoc:all
 end
 
-class StatefulLexerExtension_prerhs_postsymbol < Basis #:nodoc:all
+class StatefulLexerExtension_prerhs_postsymbol < Depager::LALR::Basis #:nodoc:all
   include Depager::ExtensionUtils
   
 
   ### Reduce Table
   reduce_table = [
     [ -1, 1 ],
+    [ 0, 3 ],
     [ 0, 4 ],
+    [ 1, 1 ],
+    [ 1, 2 ],
+    [ 2, 2 ],
+    [ 2, 2 ],
+    [ 2, 2 ],
   ]
   ### Extension Params
   nparams = {
@@ -500,27 +577,42 @@ class StatefulLexerExtension_prerhs_postsymbol < Basis #:nodoc:all
     nil => 0, 
     false => 1, 
     "[" => 2, 
-    ">" => 3, 
-    :SYMBOL => 4, 
-    "]" => 5, 
+    "]" => 3, 
+    "?" => 4, 
+    ">" => 5, 
+    :SYMBOL => 6, 
+    "+" => 7, 
+    "-" => 8, 
   }
   ### Int to Term
   i2t = [
     nil, 
     false, 
     "[", 
+    "]", 
+    "?", 
     ">", 
     :SYMBOL, 
-    "]", 
+    "+", 
+    "-", 
   ]
   ### Action Table
   action_table = [
-    [ nil, nil, 2, nil, nil, nil, ], 
-    [ ACC, nil, nil, nil, nil, nil, ], 
-    [ nil, nil, nil, 3, nil, nil, ], 
-    [ nil, nil, nil, nil, 4, nil, ], 
-    [ nil, nil, nil, nil, nil, 5, ], 
-    [ nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, 1, nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, 7, nil, 3, 4, ], 
+    [ ACC, nil, nil, nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, 8, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, 9, nil, nil, ], 
+    [ nil, nil, nil, 10, 11, 7, nil, 3, 4, ], 
+    [ nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, 13, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, 14, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
   ]
   ### Default Reduce Table
   defred_table = [
@@ -529,7 +621,16 @@ class StatefulLexerExtension_prerhs_postsymbol < Basis #:nodoc:all
     nil, 
     nil, 
     nil, 
+    nil, 
+    -3, 
+    nil, 
+    -6, 
+    -7, 
     -1, 
+    nil, 
+    -4, 
+    -5, 
+    -2, 
   ]
   defred_after_shift_table = [
     nil, 
@@ -537,24 +638,46 @@ class StatefulLexerExtension_prerhs_postsymbol < Basis #:nodoc:all
     nil, 
     nil, 
     nil, 
+    nil, 
+    -3, 
+    nil, 
+    -6, 
+    -7, 
     -1, 
+    nil, 
+    -4, 
+    -5, 
+    -2, 
   ]
   ### Nonterm to Int
   nt2i = { 
-    :start => 0, 
+    :start => 0,  
+    :option_list => 1,  
+    :option => 2, 
   }
   ### Int to Nonterm
   i2nt = [
     :start, 
+    :option_list, 
+    :option, 
   ]
   ### Goto Table
   goto_table = [ 
-   [ 1, ], 
-   [ nil, ], 
-   [ nil, ], 
-   [ nil, ], 
-   [ nil, ], 
-   [ nil, ], 
+   [ 2, nil, nil, ], 
+   [ nil, 5, 6, ], 
+   [ nil, nil, nil, ], 
+   [ nil, nil, nil, ], 
+   [ nil, nil, nil, ], 
+   [ nil, nil, 12, ], 
+   [ nil, nil, nil, ], 
+   [ nil, nil, nil, ], 
+   [ nil, nil, nil, ], 
+   [ nil, nil, nil, ], 
+   [ nil, nil, nil, ], 
+   [ nil, nil, nil, ], 
+   [ nil, nil, nil, ], 
+   [ nil, nil, nil, ], 
+   [ nil, nil, nil, ], 
   ]
 
   Tables = [ reduce_table, nparams, action_table,
@@ -590,24 +713,34 @@ class StatefulLexerExtension_prerhs_postsymbol < Basis #:nodoc:all
 
           def lex
             begin
-              until @line.empty? do
+              until @line.empty?
                 case @line
-                  when /\A\s+/
-     
-when /\A:[a-zA-Z_]+/
-     yield _Token(:SYMBOL, $&) 
-when /\A\]/
-     yield _Token($&, $&); @line = $'; yield nil, nil 
-when /\A./
-     yield _Token($&, $&) 
+                
+          when /\A\s+/
+            @oldline = @line; @line = $'
+                 
+
+        
+          when /\A:[a-zA-Z_]+\??/
+            @oldline = @line; @line = $'
+                 yield _Token(:SYMBOL, $&) 
+
+        
+          when /\A\]/
+            @oldline = @line; @line = $'
+                 yield _Token($&, $&); @line = $'; yield nil, nil 
 
+        
+          when /\A./
+            @oldline = @line; @line = $'
+                 yield _Token($&, $&) 
+
+        
                 else
                   raise RuntimeError, "must not happen #{@line}"
                 end
-                @oldline = @line
-                @line = $'
               end
-            end while @line = getline
+            end while @line0 = @line = getline
             yield nil, nil
           end
         
@@ -615,12 +748,18 @@ end
 
 ### Outer Code
 
-class D4StatefulLexerExtension_prerhs_postsymbol::NVAction < Depager::Action #:nodoc:all
+class D4StatefulLexerExtension_prerhs_postsymbol::NVAction < Depager::LALR::Action #:nodoc:all
   include Depager::DecoratorUtils
   
   on_reduce = [
     nil,
               :_act_0,
+  :_act_1,
+  :_act_2,
+  :_act_3,
+  :_act_4,
+  :_act_5,
+  :_act_6,
 
   ]
   Tables = [on_reduce]
@@ -631,15 +770,70 @@ class D4StatefulLexerExtension_prerhs_postsymbol::NVAction < Depager::Action #:n
   end
   
 
-module_eval <<-'.,.,118028146037199.,.,', 'slex.dr', 154
+module_eval <<-'.,.,11875410786796.,.,', 'slex.dr', 180
   def _act_0 val
-    _, _, _SYMBOL, _ = *val 
+    _, _option_list, _ = *val 
+
+        master.ins.push [g_parser.rhs.size, _option_list, false]
+
+  end
+
+.,.,11875410786796.,.,
+      
+module_eval <<-'.,.,118754107862281.,.,', 'slex.dr', 184
+  def _act_1 val
+    _, _option_list, _, _ = *val 
+
+        master.ins.push [g_parser.rhs.size, _option_list, true]
+
+  end
+
+.,.,118754107862281.,.,
+      
+module_eval <<-'.,.,118754107859502.,.,', 'slex.dr', 190
+  def _act_2 val
+    _option = *val 
+     [_option] 
+
+  end
+
+.,.,118754107859502.,.,
+      
+module_eval <<-'.,.,118754107825820.,.,', 'slex.dr', 191
+  def _act_3 val
+    _option_list, _option = *val 
+     _option_list << _option 
+
+  end
+
+.,.,118754107825820.,.,
+      
+module_eval <<-'.,.,118754107852027.,.,', 'slex.dr', 194
+  def _act_4 val
+    _, _SYMBOL = *val 
+     [:GOTO, _SYMBOL.value] 
+
+  end
+
+.,.,118754107852027.,.,
+      
+module_eval <<-'.,.,118754107811272.,.,', 'slex.dr', 195
+  def _act_5 val
+    _, _SYMBOL = *val 
+     [:ADD, _SYMBOL.value]  
 
-        master.ins.push [g_parser.rhs.size, _SYMBOL.value]
+  end
+
+.,.,118754107811272.,.,
+      
+module_eval <<-'.,.,118754107839236.,.,', 'slex.dr', 196
+  def _act_6 val
+    _, _SYMBOL = *val 
+     [:SUB, _SYMBOL.value]  
 
   end
 
-.,.,118028146037199.,.,
+.,.,118754107839236.,.,
       
 end