depager 0.2.2 → 0.2.3

data/lib/depager/{lex.dr → ruby/plugins/lex.dr}

@@ -1,11 +1,10 @@
 %defext LexerExtension
-%extend NVAction ('depager/nvaction.rb')
+%extend NVAction ('plugins/nvaction.rb')
 %decorate @NVAction
-#%decorate ShiftReducePrinter ('depager/srp.rb')
+#%decorate ShiftReducePrinter ('plugins/srp.rb')
 %param :none
-%hook prerulelist /%LEX\{\s*\Z/ skip
+%hook pre_rule_list /%LEX\{\s*\Z/ skip
 %banner '%LEX{ ... }'
-%mixin ActionParser ('depager/parse_action')
 %inner{
   def init_parser
     super

data/lib/depager/{lex.rb → ruby/plugins/lex.rb}

@@ -4,7 +4,6 @@
 ###
 require 'pp.rb'
 require 'depager/parser.rb'
-require 'depager/parse_action'
 
 
 module D4LexerExtension #:nodoc:all
@@ -25,9 +24,9 @@ class LexerExtension #:nodoc:all
   def __regext__ p
     super p, :none, nil
     
-    @hook[0] = LexerExtension_prerulelist.new(p, @nparam, self)
-    @h2p['prerulelist'] = @hook[0] 
-    p.prerulelist.push [@hook[0], :do_parse]
+    @hook[0] = LexerExtension_pre_rule_list.new(p, @nparam, self)
+    @h2p['pre_rule_list'] = @hook[0] 
+    p.hooks[:pre_rule_list].push [@hook[0], :do_parse]
     
     regext p
   end
@@ -39,15 +38,14 @@ end
 ### Outer Code
 
 ###
-### LexerExtension_prerulelist - Part of Depager Extension (slave)
+### LexerExtension_pre_rule_list - Part of Depager Extension (slave)
 ###
-module D4LexerExtension_prerulelist #:nodoc:all
+module D4LexerExtension_pre_rule_list #:nodoc:all
 end
 
-class LexerExtension_prerulelist < Depager::LALR::Basis #:nodoc:all
+class LexerExtension_pre_rule_list < Depager::LALR::Basis #:nodoc:all
   include Depager::ExtensionUtils
   
-  include ActionParser
 
   ### Reduce Table
   reduce_table = [
@@ -89,14 +87,14 @@ class LexerExtension_prerulelist < Depager::LALR::Basis #:nodoc:all
     [ ACC, nil, nil, nil, nil, nil, ], 
     [ nil, nil, nil, nil, 5, nil, ], 
     [ nil, nil, nil, nil, nil, nil, ], 
-    [ nil, nil, nil, 8, nil, 9, ], 
+    [ nil, nil, nil, 9, nil, 8, ], 
     [ nil, nil, nil, nil, nil, nil, ], 
     [ nil, nil, nil, nil, nil, nil, ], 
     [ nil, nil, 10, nil, nil, nil, ], 
-    [ nil, nil, nil, nil, 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, ], 
   ]
   ### Default Reduce Table
   defred_table = [
@@ -108,8 +106,8 @@ class LexerExtension_prerulelist < Depager::LALR::Basis #:nodoc:all
     -7, 
     -3, 
     nil, 
-    -6, 
     nil, 
+    -6, 
     -4, 
     -8, 
   ]
@@ -122,8 +120,8 @@ class LexerExtension_prerulelist < Depager::LALR::Basis #:nodoc:all
     -7, 
     -3, 
     nil, 
-    -6, 
     nil, 
+    -6, 
     -4, 
     -8, 
   ]
@@ -169,7 +167,7 @@ class LexerExtension_prerulelist < Depager::LALR::Basis #:nodoc:all
     @g_parser = @p = p
     @master   = @m = master
     @nparam   = nparam
-    @dect     = D4LexerExtension_prerulelist::NVAction.new(self)
+    @dect     = D4LexerExtension_pre_rule_list::NVAction.new(self)
     init_parser
   end
 
@@ -228,9 +226,9 @@ end
 
 ### Outer Code
 
-class D4LexerExtension_prerulelist::NVAction < Depager::LALR::Action #:nodoc:all
+class D4LexerExtension_pre_rule_list::NVAction < Depager::LALR::Action #:nodoc:all
   include Depager::DecoratorUtils
-  ["        include ActionParser\n"]
+  
   on_reduce = [
     nil,
               :_act_0,
@@ -251,7 +249,7 @@ class D4LexerExtension_prerulelist::NVAction < Depager::LALR::Action #:nodoc:all
   end
   
 
-module_eval <<-'.,.,12099829229538.,.,', 'lex.dr', 48
+module_eval <<-'.,.,122745803340181.,.,', 'lex.dr', 47
 def _act_0 val
     _lexactlist, = *val 
 
@@ -271,25 +269,25 @@ def _act_0 val
         }; #code
 
 end
-.,.,12099829229538.,.,
+.,.,122745803340181.,.,
       
-module_eval <<-'.,.,12099829229930.,.,', 'lex.dr', 66
+module_eval <<-'.,.,122745803321867.,.,', 'lex.dr', 65
 def _act_1 val
     _lexact, = *val 
      _lexact 
 
 end
-.,.,12099829229930.,.,
+.,.,122745803321867.,.,
       
-module_eval <<-'.,.,120998292251446.,.,', 'lex.dr', 67
+module_eval <<-'.,.,122745803341492.,.,', 'lex.dr', 66
 def _act_2 val
     _lexactlist, _lexact, = *val 
      _lexactlist << _lexact 
 
 end
-.,.,120998292251446.,.,
+.,.,122745803341492.,.,
       
-module_eval <<-'.,.,12099829229876.,.,', 'lex.dr', 71
+module_eval <<-'.,.,1227458033110.,.,', 'lex.dr', 70
 def _act_3 val
     _lexlist, _opt_noskip, _ACTION, = *val 
 
@@ -300,38 +298,38 @@ def _act_3 val
         }; #code
 
 end
-.,.,12099829229876.,.,
+.,.,1227458033110.,.,
       
-module_eval <<-'.,.,120998292261886.,.,', 'lex.dr', 80
+module_eval <<-'.,.,122745803341618.,.,', 'lex.dr', 79
 def _act_4 val
      false 
 
 end
-.,.,120998292261886.,.,
+.,.,122745803341618.,.,
       
-module_eval <<-'.,.,120998292263869.,.,', 'lex.dr', 81
+module_eval <<-'.,.,122745803352625.,.,', 'lex.dr', 80
 def _act_5 val
     _, = *val 
      true  
 
 end
-.,.,120998292263869.,.,
+.,.,122745803352625.,.,
       
-module_eval <<-'.,.,120998292217015.,.,', 'lex.dr', 84
+module_eval <<-'.,.,122745803357424.,.,', 'lex.dr', 83
 def _act_6 val
     _LEX, = *val 
      [ _LEX ] 
 
 end
-.,.,120998292217015.,.,
+.,.,122745803357424.,.,
       
-module_eval <<-'.,.,120998292239616.,.,', 'lex.dr', 85
+module_eval <<-'.,.,122745803338595.,.,', 'lex.dr', 84
 def _act_7 val
     _lexlist, _, _LEX, = *val 
      _lexlist << _LEX 
 
 end
-.,.,120998292239616.,.,
+.,.,122745803338595.,.,
       
 end
       

data/lib/depager/{nvaction.rb → ruby/plugins/nvaction.rb}

@@ -1,6 +1,4 @@
-require 'depager/action.rb'
-require 'depager/parser.rb'
-require 'depager/parse_action.rb'
+require 'plugins/action.rb'
 
 class NVActionExtension < ActionExtension #:nodoc:all
   def modify_action_code code

data/lib/depager/{slex.dr → ruby/plugins/slex.dr}

@@ -1,8 +1,8 @@
 %defext StatefulLexerExtension
-%extend Lexer ('depager/lex.rb')
-%extend NVAction ('depager/nvaction.rb')
+%extend Lexer ('plugins/lex.rb')
+%extend NVAction ('plugins/nvaction.rb')
 %decorate @NVAction
-#%decorate ShiftReducePrinter ('depager/srp.rb')
+#%decorate ShiftReducePrinter ('plugins/srp.rb')
 %inner{
   attr_accessor :ins, :code, :optval
   def init_parser
@@ -12,7 +12,7 @@
     @on_reduce = []
     @addition = []
   end
-  def postRuleList
+  def post_rule_list
     @optouter << %{
       def afterError
         warn "StatefulLex: lex_state==\#{@basis.lex_state}" if $MP_DEBUG
@@ -22,7 +22,7 @@
       gen_action_decorator_code(target_name, paramkey,
                                 @on_reduce, @optouter)
   end
-  def postRhs
+  def post_rhs
     j = 0
     rhs = g_parser.rhs
     @ins.each do |i, option_list, debug|
@@ -60,7 +60,7 @@
     end
     @ins.clear
   end
-  def postRhsList
+  def post_rhs_list
     @addition.each do |isym, m_name|  
       g_parser.add_rule isym, []
       @on_reduce[nrules] = ':'+m_name
@@ -71,26 +71,25 @@
 ######################################################################
 # Define Tokens
 ######################################################################
-%hook prerulelist /%LEX\{\s*\Z/ skip
-%mixin ActionParser ('depager/parse_action')
+%hook pre_rule_list /%LEX\{\s*\Z/ skip
 %banner '%LEX{ ... }'
 %%
 %LEX{
   /\s+/, /#.*\Z/           { }
-  /[A-Z]+/                 { yield _Token(:ID, $&) }
+  /[A-Z]+/                 { yield token(:ID, $&) }
   /\%\}\s*\Z/              { yield nil,nil }
-  /\/(([^\/\\]+|\\.)*)\//  { yield _Token(:LEX, "/\\A#{$1}/") }
+  /\/(([^\/\\]+|\\.)*)\//  { yield token(:LEX, "/\\A#{$1}/") }
   /'([^'\\]+|\\.)*'/,
   /"([^"\\]+|\\.)*"/
   { 
-    yield _Token(:LEX, "/\\A#{Regexp.escape($1).gsub('/', '\/')}/")
+    yield token(:LEX, "/\\A#{Regexp.escape($1).gsub('/', '\/')}/")
   }
   '{' !
   { 
     _lineno = lineno
-    yield _Token(:ACTION, parse_action, _lineno)
+    yield token(:ACTION, parse_action, _lineno)
   }
-  /./                      { yield _Token($&, $&) }
+  /./                      { yield token($&, $&) }
 %}
 #begin-rule
   start:
@@ -166,14 +165,14 @@
 ######################################################################
 # Change State
 ######################################################################
-%hook prerhs postsymbol /\[/
+%hook pre_rhs post_symbol /\[/
 %banner '[> ...]'
 %%
 %LEX{
   /\s+/            { }
-  /:[a-zA-Z_]+\??/ { yield _Token(:SYMBOL, $&) }
-  /\]/             { yield _Token($&, $&); @line = $'; yield nil, nil }
-  /./              { yield _Token($&, $&) }
+  /:[a-zA-Z_]+\??/ { yield token(:SYMBOL, $&) }
+  /\]/             { yield token($&, $&); @line = $'; yield nil, nil }
+  /./              { yield token($&, $&) }
 %}
 
 #begin-rule

data/lib/depager/{slex.rb → ruby/plugins/slex.rb}

@@ -4,7 +4,6 @@
 ###
 require 'pp.rb'
 require 'depager/parser.rb'
-require 'depager/parse_action'
 
 
 module D4StatefulLexerExtension #:nodoc:all
@@ -25,16 +24,16 @@ class StatefulLexerExtension #:nodoc:all
   def __regext__ p
     super p, :default, nil
     
-    @hook[0] = StatefulLexerExtension_prerulelist.new(p, @nparam, self)
-    @h2p['prerulelist'] = @hook[0] 
-    p.prerulelist.push [@hook[0], :do_parse]
+    @hook[0] = StatefulLexerExtension_pre_rhs__post_symbol.new(p, @nparam, self)
+    @h2p['pre_rhs__post_symbol'] = @hook[0] 
+    p.hooks[:post_symbol].push [@hook[0], :do_parse]
     
-    @hook[1] = StatefulLexerExtension_prerhs_postsymbol.new(p, @nparam, self)
-    @h2p['prerhs_postsymbol'] = @hook[1] 
-    p.prerhs.push [@hook[1], :do_parse]
+    @hook[1] = StatefulLexerExtension_pre_rule_list.new(p, @nparam, self)
+    @h2p['pre_rule_list'] = @hook[1] 
+    p.hooks[:pre_rule_list].push [@hook[1], :do_parse]
     
-    # use @hook[1](StatefulLexerExtension_prerhs_postsymbol)
-    p.postsymbol.push [@hook[1], :do_parse]
+    # use @hook[0](StatefulLexerExtension_pre_rhs__post_symbol)
+    p.hooks[:pre_rhs].push [@hook[0], :do_parse]
     
     regext p
   end
@@ -48,7 +47,7 @@ class StatefulLexerExtension #:nodoc:all
     @on_reduce = []
     @addition = []
   end
-  def postRuleList
+  def post_rule_list
     @optouter << %{
       def afterError
         warn "StatefulLex: lex_state==\#{@basis.lex_state}" if $MP_DEBUG
@@ -58,7 +57,7 @@ class StatefulLexerExtension #:nodoc:all
       gen_action_decorator_code(target_name, paramkey,
                                 @on_reduce, @optouter)
   end
-  def postRhs
+  def post_rhs
     j = 0
     rhs = g_parser.rhs
     @ins.each do |i, option_list, debug|
@@ -96,7 +95,7 @@ class StatefulLexerExtension #:nodoc:all
     end
     @ins.clear
   end
-  def postRhsList
+  def post_rhs_list
     @addition.each do |isym, m_name|  
       g_parser.add_rule isym, []
       @on_reduce[nrules] = ':'+m_name
@@ -109,15 +108,14 @@ end
 ### Outer Code
 
 ###
-### StatefulLexerExtension_prerulelist - Part of Depager Extension (slave)
+### StatefulLexerExtension_pre_rule_list - Part of Depager Extension (slave)
 ###
-module D4StatefulLexerExtension_prerulelist #:nodoc:all
+module D4StatefulLexerExtension_pre_rule_list #:nodoc:all
 end
 
-class StatefulLexerExtension_prerulelist < Depager::LALR::Basis #:nodoc:all
+class StatefulLexerExtension_pre_rule_list < Depager::LALR::Basis #:nodoc:all
   include Depager::ExtensionUtils
   
-  include ActionParser
 
   ### Reduce Table
   reduce_table = [
@@ -170,20 +168,20 @@ class StatefulLexerExtension_prerulelist < Depager::LALR::Basis #:nodoc:all
   action_table = [
     [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
     [ ACC, 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, 8, nil, ], 
-    [ nil, nil, nil, 9, nil, nil, nil, nil, nil, nil, ], 
-    [ nil, nil, nil, nil, nil, nil, nil, nil, 8, 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, 12, nil, 13, ], 
     [ nil, nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
-    [ nil, nil, nil, nil, nil, 15, 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, 16, 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, 17, nil, ], 
-    [ nil, nil, nil, nil, 18, nil, 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, ], 
@@ -196,21 +194,21 @@ class StatefulLexerExtension_prerulelist < Depager::LALR::Basis #:nodoc:all
     -1, 
     nil, 
     nil, 
-    -3, 
+    -5, 
+    -12, 
     -7, 
     -10, 
-    -12, 
-    -5, 
-    -8, 
+    -3, 
     nil, 
-    -11, 
     nil, 
+    -11, 
     nil, 
     nil, 
-    -9, 
-    -13, 
+    -8, 
     -4, 
     -6, 
+    -13, 
+    -9, 
   ]
   defred_after_shift_table = [
     -2, 
@@ -219,20 +217,20 @@ class StatefulLexerExtension_prerulelist < Depager::LALR::Basis #:nodoc:all
     nil, 
     nil, 
     nil, 
+    -12, 
     -7, 
     nil, 
-    -12, 
     nil, 
-    -8, 
     nil, 
-    -11, 
     nil, 
+    -11, 
     nil, 
     nil, 
-    -9, 
-    -13, 
+    -8, 
     -4, 
     -6, 
+    -13, 
+    -9, 
   ]
   ### Nonterm to Int
   nt2i = { 
@@ -260,14 +258,14 @@ class StatefulLexerExtension_prerulelist < Depager::LALR::Basis #:nodoc:all
   goto_table = [ 
    [ 1, 2, nil, nil, nil, nil, nil, nil, ], 
    [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
-   [ nil, nil, 3, nil, nil, nil, nil, nil, ], 
-   [ nil, nil, nil, 5, nil, 6, 7, nil, ], 
+   [ nil, nil, 4, nil, nil, nil, nil, nil, ], 
    [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
-   [ nil, nil, nil, nil, nil, 10, 7, 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, 11, ], 
    [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
-   [ nil, nil, nil, nil, 14, 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, ], 
@@ -290,7 +288,7 @@ class StatefulLexerExtension_prerulelist < Depager::LALR::Basis #:nodoc:all
     @g_parser = @p = p
     @master   = @m = master
     @nparam   = nparam
-    @dect     = D4StatefulLexerExtension_prerulelist::NVAction.new(self)
+    @dect     = D4StatefulLexerExtension_pre_rule_list::NVAction.new(self)
     init_parser
   end
 
@@ -323,7 +321,7 @@ class StatefulLexerExtension_prerulelist < Depager::LALR::Basis #:nodoc:all
         
           when /\A[A-Z]+/
             @oldline = @line; @line = $'
-                 yield _Token(:ID, $&) 
+                 yield token(:ID, $&) 
 
         
           when /\A\%\}\s*\Z/
@@ -333,25 +331,25 @@ class StatefulLexerExtension_prerulelist < Depager::LALR::Basis #:nodoc:all
         
           when /\A\/(([^\/\\]+|\\.)*)\//
             @oldline = @line; @line = $'
-                 yield _Token(:LEX, "/\\A#{$1}/") 
+                 yield token(:LEX, "/\\A#{$1}/") 
 
         
           when /\A'([^'\\]+|\\.)*'/, /\A"([^"\\]+|\\.)*"/
             @oldline = @line; @line = $'
              
-    yield _Token(:LEX, "/\\A#{Regexp.escape($1).gsub('/', '\/')}/")
+    yield token(:LEX, "/\\A#{Regexp.escape($1).gsub('/', '\/')}/")
 
         
           when /\A\{/
             #
              
     _lineno = lineno
-    yield _Token(:ACTION, parse_action, _lineno)
+    yield token(:ACTION, parse_action, _lineno)
 
         
           when /\A./
             @oldline = @line; @line = $'
-                 yield _Token($&, $&) 
+                 yield token($&, $&) 
 
         
                 else
@@ -366,9 +364,9 @@ end
 
 ### Outer Code
 
-class D4StatefulLexerExtension_prerulelist::NVAction < Depager::LALR::Action #:nodoc:all
+class D4StatefulLexerExtension_pre_rule_list::NVAction < Depager::LALR::Action #:nodoc:all
   include Depager::DecoratorUtils
-  ["        include ActionParser\n"]
+  
   on_reduce = [
     nil,
               :_act_0,
@@ -394,7 +392,7 @@ class D4StatefulLexerExtension_prerulelist::NVAction < Depager::LALR::Action #:n
   end
   
 
-module_eval <<-'.,.,120998292328650.,.,', 'slex.dr', 96
+module_eval <<-'.,.,1227458033159.,.,', 'slex.dr', 95
 def _act_0 val
     _mode_list, = *val 
 
@@ -430,63 +428,63 @@ def _act_0 val
         }; #code
 
 end
-.,.,120998292328650.,.,
+.,.,1227458033159.,.,
       
-module_eval <<-'.,.,120998292354849.,.,', 'slex.dr', 130
+module_eval <<-'.,.,122745803342120.,.,', 'slex.dr', 129
 def _act_1 val
      [ ] 
 
 end
-.,.,120998292354849.,.,
+.,.,122745803342120.,.,
       
-module_eval <<-'.,.,120998292352082.,.,', 'slex.dr', 131
+module_eval <<-'.,.,12274580336600.,.,', 'slex.dr', 130
 def _act_2 val
     _mode_list, _mode, _lexactlist, = *val 
      _mode_list << [_mode[0], _mode[1], _lexactlist] 
 
 end
-.,.,120998292352082.,.,
+.,.,12274580336600.,.,
       
-module_eval <<-'.,.,12099829232991.,.,', 'slex.dr', 134
+module_eval <<-'.,.,122745803347797.,.,', 'slex.dr', 133
 def _act_3 val
     _, _ID, _opt_super, _, = *val 
      [ _ID.value, _opt_super ] 
 
 end
-.,.,12099829232991.,.,
+.,.,122745803347797.,.,
       
-module_eval <<-'.,.,12099829237562.,.,', 'slex.dr', 137
+module_eval <<-'.,.,122745803312942.,.,', 'slex.dr', 136
 def _act_4 val
      nil 
 
 end
-.,.,12099829237562.,.,
+.,.,122745803312942.,.,
       
-module_eval <<-'.,.,120998292348892.,.,', 'slex.dr', 138
+module_eval <<-'.,.,122745803315084.,.,', 'slex.dr', 137
 def _act_5 val
     _, _ID, = *val 
      _ID.value 
 
 end
-.,.,120998292348892.,.,
+.,.,122745803315084.,.,
       
-module_eval <<-'.,.,120998292360134.,.,', 'slex.dr', 141
+module_eval <<-'.,.,12274580334440.,.,', 'slex.dr', 140
 def _act_6 val
     _lexact, = *val 
      _lexact 
 
 end
-.,.,120998292360134.,.,
+.,.,12274580334440.,.,
       
-module_eval <<-'.,.,120998292332012.,.,', 'slex.dr', 142
+module_eval <<-'.,.,122745803358254.,.,', 'slex.dr', 141
 def _act_7 val
     _lexactlist, _lexact, = *val 
      _lexactlist << _lexact 
 
 end
-.,.,120998292332012.,.,
+.,.,122745803358254.,.,
       
-module_eval <<-'.,.,12099829232968.,.,', 'slex.dr', 146
+module_eval <<-'.,.,122745803337351.,.,', 'slex.dr', 145
 def _act_8 val
     _lexlist, _opt_noskip, _ACTION, = *val 
 
@@ -497,49 +495,49 @@ def _act_8 val
         }; #code
 
 end
-.,.,12099829232968.,.,
+.,.,122745803337351.,.,
       
-module_eval <<-'.,.,120998292350935.,.,', 'slex.dr', 155
+module_eval <<-'.,.,122745803316408.,.,', 'slex.dr', 154
 def _act_9 val
      false 
 
 end
-.,.,120998292350935.,.,
+.,.,122745803316408.,.,
       
-module_eval <<-'.,.,120998292356440.,.,', 'slex.dr', 156
+module_eval <<-'.,.,122745803341193.,.,', 'slex.dr', 155
 def _act_10 val
     _, = *val 
      true  
 
 end
-.,.,120998292356440.,.,
+.,.,122745803341193.,.,
       
-module_eval <<-'.,.,120998292318605.,.,', 'slex.dr', 159
+module_eval <<-'.,.,12274580332500.,.,', 'slex.dr', 158
 def _act_11 val
     _LEX, = *val 
      [ _LEX.value ] 
 
 end
-.,.,120998292318605.,.,
+.,.,12274580332500.,.,
       
-module_eval <<-'.,.,120998292362428.,.,', 'slex.dr', 160
+module_eval <<-'.,.,122745803323427.,.,', 'slex.dr', 159
 def _act_12 val
     _lexlist, _, _LEX, = *val 
      _lexlist.push _LEX.value 
 
 end
-.,.,120998292362428.,.,
+.,.,122745803323427.,.,
       
 end
       
 
 ###
-### StatefulLexerExtension_prerhs_postsymbol - Part of Depager Extension (slave)
+### StatefulLexerExtension_pre_rhs__post_symbol - Part of Depager Extension (slave)
 ###
-module D4StatefulLexerExtension_prerhs_postsymbol #:nodoc:all
+module D4StatefulLexerExtension_pre_rhs__post_symbol #:nodoc:all
 end
 
-class StatefulLexerExtension_prerhs_postsymbol < Depager::LALR::Basis #:nodoc:all
+class StatefulLexerExtension_pre_rhs__post_symbol < Depager::LALR::Basis #:nodoc:all
   include Depager::ExtensionUtils
   
 
@@ -584,18 +582,18 @@ class StatefulLexerExtension_prerhs_postsymbol < Depager::LALR::Basis #:nodoc:al
   ]
   ### Action Table
   action_table = [
-    [ nil, nil, 2, 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, 5, nil, 6, 7, ], 
-    [ nil, nil, nil, 8, 10, 5, nil, 6, 7, ], 
+    [ 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, 11, nil, nil, ], 
-    [ nil, nil, nil, nil, nil, nil, 12, 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, 14, 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, ], 
@@ -606,16 +604,16 @@ class StatefulLexerExtension_prerhs_postsymbol < Depager::LALR::Basis #:nodoc:al
     nil, 
     nil, 
     nil, 
-    -3, 
     nil, 
     nil, 
+    -3, 
     nil, 
+    -6, 
+    -7, 
     -1, 
-    -4, 
     nil, 
+    -4, 
     -5, 
-    -6, 
-    -7, 
     -2, 
   ]
   defred_after_shift_table = [
@@ -623,16 +621,16 @@ class StatefulLexerExtension_prerhs_postsymbol < Depager::LALR::Basis #:nodoc:al
     nil, 
     nil, 
     nil, 
-    -3, 
     nil, 
     nil, 
+    -3, 
     nil, 
+    -6, 
+    -7, 
     -1, 
-    -4, 
     nil, 
+    -4, 
     -5, 
-    -6, 
-    -7, 
     -2, 
   ]
   ### Nonterm to Int
@@ -649,12 +647,12 @@ class StatefulLexerExtension_prerhs_postsymbol < Depager::LALR::Basis #:nodoc:al
   ]
   ### Goto Table
   goto_table = [ 
-   [ 1, nil, nil, ], 
+   [ 2, nil, nil, ], 
+   [ nil, 5, 6, ], 
    [ nil, nil, nil, ], 
-   [ nil, 3, 4, ], 
-   [ nil, nil, 9, ], 
    [ nil, nil, nil, ], 
    [ nil, nil, nil, ], 
+   [ nil, nil, 12, ], 
    [ nil, nil, nil, ], 
    [ nil, nil, nil, ], 
    [ nil, nil, nil, ], 
@@ -676,7 +674,7 @@ class StatefulLexerExtension_prerhs_postsymbol < Depager::LALR::Basis #:nodoc:al
     @g_parser = @p = p
     @master   = @m = master
     @nparam   = nparam
-    @dect     = D4StatefulLexerExtension_prerhs_postsymbol::NVAction.new(self)
+    @dect     = D4StatefulLexerExtension_pre_rhs__post_symbol::NVAction.new(self)
     init_parser
   end
 
@@ -709,17 +707,17 @@ class StatefulLexerExtension_prerhs_postsymbol < Depager::LALR::Basis #:nodoc:al
         
           when /\A:[a-zA-Z_]+\??/
             @oldline = @line; @line = $'
-                 yield _Token(:SYMBOL, $&) 
+                 yield token(:SYMBOL, $&) 
 
         
           when /\A\]/
             @oldline = @line; @line = $'
-                 yield _Token($&, $&); @line = $'; yield nil, nil 
+                 yield token($&, $&); @line = $'; yield nil, nil 
 
         
           when /\A./
             @oldline = @line; @line = $'
-                 yield _Token($&, $&) 
+                 yield token($&, $&) 
 
         
                 else
@@ -734,9 +732,9 @@ end
 
 ### Outer Code
 
-class D4StatefulLexerExtension_prerhs_postsymbol::NVAction < Depager::LALR::Action #:nodoc:all
+class D4StatefulLexerExtension_pre_rhs__post_symbol::NVAction < Depager::LALR::Action #:nodoc:all
   include Depager::DecoratorUtils
-  []
+  
   on_reduce = [
     nil,
               :_act_0,
@@ -756,63 +754,63 @@ class D4StatefulLexerExtension_prerhs_postsymbol::NVAction < Depager::LALR::Acti
   end
   
 
-module_eval <<-'.,.,120998292310380.,.,', 'slex.dr', 180
+module_eval <<-'.,.,122745803310395.,.,', 'slex.dr', 179
 def _act_0 val
     _, _option_list, _, = *val 
 
         master.ins.push [g_parser.rhs.size, _option_list, false]
 
 end
-.,.,120998292310380.,.,
+.,.,122745803310395.,.,
       
-module_eval <<-'.,.,120998292354182.,.,', 'slex.dr', 184
+module_eval <<-'.,.,122745803327506.,.,', 'slex.dr', 183
 def _act_1 val
     _, _option_list, _, _, = *val 
 
         master.ins.push [g_parser.rhs.size, _option_list, true]
 
 end
-.,.,120998292354182.,.,
+.,.,122745803327506.,.,
       
-module_eval <<-'.,.,120998292345458.,.,', 'slex.dr', 190
+module_eval <<-'.,.,122745803335394.,.,', 'slex.dr', 189
 def _act_2 val
     _option, = *val 
      [_option] 
 
 end
-.,.,120998292345458.,.,
+.,.,122745803335394.,.,
       
-module_eval <<-'.,.,120998292359833.,.,', 'slex.dr', 191
+module_eval <<-'.,.,122745803345722.,.,', 'slex.dr', 190
 def _act_3 val
     _option_list, _option, = *val 
      _option_list << _option 
 
 end
-.,.,120998292359833.,.,
+.,.,122745803345722.,.,
       
-module_eval <<-'.,.,120998292340459.,.,', 'slex.dr', 194
+module_eval <<-'.,.,122745803311899.,.,', 'slex.dr', 193
 def _act_4 val
     _, _SYMBOL, = *val 
      [:GOTO, _SYMBOL.value] 
 
 end
-.,.,120998292340459.,.,
+.,.,122745803311899.,.,
       
-module_eval <<-'.,.,120998292339947.,.,', 'slex.dr', 195
+module_eval <<-'.,.,122745803346690.,.,', 'slex.dr', 194
 def _act_5 val
     _, _SYMBOL, = *val 
      [:ADD, _SYMBOL.value]  
 
 end
-.,.,120998292339947.,.,
+.,.,122745803346690.,.,
       
-module_eval <<-'.,.,120998292319195.,.,', 'slex.dr', 196
+module_eval <<-'.,.,122745803330412.,.,', 'slex.dr', 195
 def _act_6 val
     _, _SYMBOL, = *val 
      [:SUB, _SYMBOL.value]  
 
 end
-.,.,120998292319195.,.,
+.,.,122745803330412.,.,
       
 end