depager 0.2.0 → 0.2.2

data/lib/depager/astdf.rb

@@ -1,10 +1,7 @@
-require 'depager/ast_base.rb'
-class ASTBuilderDepthFirstExtension < ASTBuilderBaseExtension #:nodoc:all
-  def modify_action_code code, nodes=[]
-    code.gsub(/~([a-z_])/, 'node.\1')
-  end
+require 'depager/ast.rb'
+class ASTBuilderDepthFirstExtension < ASTBuilderExtension #:nodoc:all
   def gen_accept_code sym
     "        @#{sym}.accept(v)\n"
   end
-  Template = CodeUtils::make_tmpl("#{Depager::Tmpldir}/astdf.erbs")
+  Template = superclass::Template
 end

data/lib/depager/atree.rb

@@ -102,14 +102,14 @@ class ATreeBuilderExtension_postrhs < Depager::LALR::Basis #:nodoc:all
     [ nil, nil, nil, 4, nil, nil, nil, nil, ], 
     [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
     [ nil, nil, nil, nil, 5, nil, nil, nil, ], 
-    [ nil, nil, nil, 7, nil, 10, nil, 6, ], 
+    [ nil, nil, nil, 9, nil, 6, nil, 10, ], 
     [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, 11, 12, nil, ], 
     [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
-    [ nil, nil, nil, nil, nil, 12, 11, nil, ], 
     [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
     [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
-    [ nil, nil, nil, 7, nil, nil, nil, 6, ], 
     [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, 9, nil, nil, nil, 10, ], 
     [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
   ]
   ### Default Reduce Table
@@ -120,13 +120,13 @@ class ATreeBuilderExtension_postrhs < Depager::LALR::Basis #:nodoc:all
     -1, 
     -4, 
     nil, 
-    -8, 
-    -7, 
-    nil, 
-    -5, 
     -2, 
     nil, 
+    -5, 
+    -7, 
+    -8, 
     -3, 
+    nil, 
     -6, 
   ]
   defred_after_shift_table = [
@@ -136,13 +136,13 @@ class ATreeBuilderExtension_postrhs < Depager::LALR::Basis #:nodoc:all
     -1, 
     nil, 
     nil, 
-    -8, 
-    -7, 
-    nil, 
-    -5, 
     -2, 
     nil, 
+    -5, 
+    -7, 
+    -8, 
     -3, 
+    nil, 
     -6, 
   ]
   ### Nonterm to Int
@@ -166,14 +166,14 @@ class ATreeBuilderExtension_postrhs < Depager::LALR::Basis #:nodoc:all
    [ nil, 3, nil, nil, ], 
    [ nil, nil, nil, nil, ], 
    [ nil, nil, nil, nil, ], 
-   [ nil, nil, 8, 9, ], 
+   [ nil, nil, 7, 8, ], 
    [ nil, nil, nil, nil, ], 
    [ nil, nil, nil, nil, ], 
    [ nil, nil, nil, nil, ], 
    [ nil, nil, nil, nil, ], 
    [ nil, nil, nil, nil, ], 
-   [ nil, nil, nil, 13, ], 
    [ nil, nil, nil, nil, ], 
+   [ nil, nil, nil, 13, ], 
    [ nil, nil, nil, nil, ], 
   ]
 
@@ -253,7 +253,7 @@ end
 
 class D4ATreeBuilderExtension_postrhs::NVAction < Depager::LALR::Action #:nodoc:all
   include Depager::DecoratorUtils
-  
+  []
   on_reduce = [
     nil,
               :_act_0,
@@ -274,81 +274,73 @@ class D4ATreeBuilderExtension_postrhs::NVAction < Depager::LALR::Action #:nodoc:
   end
   
 
-module_eval <<-'.,.,118754107734084.,.,', 'atree.dr', 32
-  def _act_0 val
-    _EG, _ast = *val 
+module_eval <<-'.,.,120998292334355.,.,', 'atree.dr', 32
+def _act_0 val
+    _EG, _ast, = *val 
 
         n = master.nrules
         master.optouter <<
           master.gen_defm_code("_atree_#{n} val", _ast, _EG.lineno)
         master.on_reduce[n] = ":_atree_#{n}"
 
-  end
-
-.,.,118754107734084.,.,
+end
+.,.,120998292334355.,.,
       
-module_eval <<-'.,.,11875410773078.,.,', 'atree.dr', 40
-  def _act_1 val
-    _ID, _, _ = *val 
+module_eval <<-'.,.,120998292322383.,.,', 'atree.dr', 40
+def _act_1 val
+    _ID, _, _, = *val 
      "[:#{_ID.value}]" 
 
-  end
-
-.,.,11875410773078.,.,
+end
+.,.,120998292322383.,.,
       
-module_eval <<-'.,.,118754107728685.,.,', 'atree.dr', 41
-  def _act_2 val
-    _ID, _, _fact_list, _ = *val 
+module_eval <<-'.,.,120998292327560.,.,', 'atree.dr', 41
+def _act_2 val
+    _ID, _, _fact_list, _, = *val 
      "[:#{_ID.value}, #{_fact_list.join(',')}]" 
 
-  end
-
-.,.,118754107728685.,.,
+end
+.,.,120998292327560.,.,
       
-module_eval <<-'.,.,118754107760030.,.,', 'atree.dr', 42
-  def _act_3 val
-    _ID = *val 
+module_eval <<-'.,.,120998292335893.,.,', 'atree.dr', 42
+def _act_3 val
+    _ID, = *val 
      "val[#{g_parser.name_to_rhs_index(_ID.value)}]" 
 
-  end
-
-.,.,118754107760030.,.,
+end
+.,.,120998292335893.,.,
       
-module_eval <<-'.,.,118754107732642.,.,', 'atree.dr', 45
-  def _act_4 val
-    _fact = *val 
+module_eval <<-'.,.,120998292340950.,.,', 'atree.dr', 45
+def _act_4 val
+    _fact, = *val 
      [ _fact ] 
 
-  end
-
-.,.,118754107732642.,.,
+end
+.,.,120998292340950.,.,
       
-module_eval <<-'.,.,118754107753843.,.,', 'atree.dr', 46
-  def _act_5 val
-    _fact_list, _, _fact = *val 
+module_eval <<-'.,.,120998292327661.,.,', 'atree.dr', 46
+def _act_5 val
+    _fact_list, _, _fact, = *val 
      _fact_list.push _fact 
 
-  end
-
-.,.,118754107753843.,.,
+end
+.,.,120998292327661.,.,
       
-module_eval <<-'.,.,118754107752237.,.,', 'atree.dr', 49
-  def _act_6 val
-    _ID = *val 
+module_eval <<-'.,.,120998292362107.,.,', 'atree.dr', 49
+def _act_6 val
+    _ID, = *val 
      "val[#{g_parser.name_to_rhs_index(_ID.value)}]" 
 
-  end
-
-.,.,118754107752237.,.,
+end
+.,.,120998292362107.,.,
       
-module_eval <<-'.,.,118754107722958.,.,', 'atree.dr', 50
-  def _act_7 val
-    _STR = *val 
+module_eval <<-'.,.,120998292336597.,.,', 'atree.dr', 50
+def _act_7 val
+    _STR, = *val 
      "'#{_STR.value}'" 
 
-  end
-
-.,.,118754107722958.,.,
+end
+.,.,120998292336597.,.,
       
 end
       

data/lib/depager/cst.dr

@@ -33,7 +33,7 @@
     nodes = g_parser.rhs.map do |i| 
       x = g_parser.int_to_sym(i)
       if x.class == String
-        "tx#{x[0].to_s(16)}"
+        "tx#{x.unpack("H*")[0]}"
       else
         x = x.to_s
         accept << "#{x}.accept(v); " if x =~ /\A[a-z_]+\Z/
@@ -82,7 +82,7 @@
       end
     }; #code
     g_parser.optouter <<
-      code.sub!('$$!!@ CST @!!$$', @visitor_code.to_s) <<
+      code.sub!('$$!!@ CST @!!$$', @visitor_code.join) <<
       unindent(@nodes_code) <<
       gen_action_decorator_code(target_name, paramkey,
                                 @on_reduce, @optouter)

data/lib/depager/cst.rb

@@ -66,7 +66,7 @@ class CSTBuilderExtension #:nodoc:all
     nodes = g_parser.rhs.map do |i| 
       x = g_parser.int_to_sym(i)
       if x.class == String
-        "tx#{x[0].to_s(16)}"
+        "tx#{x.unpack("H*")[0]}"
       else
         x = x.to_s
         accept << "#{x}.accept(v); " if x =~ /\A[a-z_]+\Z/
@@ -115,7 +115,7 @@ class CSTBuilderExtension #:nodoc:all
       end
     }; #code
     g_parser.optouter <<
-      code.sub!('$$!!@ CST @!!$$', @visitor_code.to_s) <<
+      code.sub!('$$!!@ CST @!!$$', @visitor_code.join) <<
       unindent(@nodes_code) <<
       gen_action_decorator_code(target_name, paramkey,
                                 @on_reduce, @optouter)
@@ -167,10 +167,10 @@ class CSTBuilderExtension_prerulelist < Depager::LALR::Basis #:nodoc:all
   ]
   ### Action Table
   action_table = [
-    [ nil, nil, 1, nil, nil, ], 
-    [ nil, nil, nil, 4, nil, ], 
+    [ nil, nil, 3, nil, nil, ], 
     [ ACC, nil, nil, nil, nil, ], 
     [ nil, nil, nil, nil, 5, ], 
+    [ nil, nil, nil, 6, nil, ], 
     [ nil, nil, nil, nil, nil, ], 
     [ nil, nil, nil, 7, nil, ], 
     [ nil, nil, nil, nil, nil, ], 
@@ -180,11 +180,11 @@ class CSTBuilderExtension_prerulelist < Depager::LALR::Basis #:nodoc:all
   defred_table = [
     -2, 
     nil, 
-    nil, 
     -4, 
-    -3, 
     nil, 
     -1, 
+    nil, 
+    -3, 
     -5, 
   ]
   defred_after_shift_table = [
@@ -192,9 +192,9 @@ class CSTBuilderExtension_prerulelist < Depager::LALR::Basis #:nodoc:all
     nil, 
     nil, 
     nil, 
-    -3, 
-    nil, 
     -1, 
+    nil, 
+    -3, 
     -5, 
   ]
   ### Nonterm to Int
@@ -211,10 +211,10 @@ class CSTBuilderExtension_prerulelist < Depager::LALR::Basis #:nodoc:all
   ]
   ### Goto Table
   goto_table = [ 
-   [ 2, 3, nil, ], 
+   [ 1, 2, nil, ], 
    [ nil, nil, nil, ], 
+   [ nil, nil, 4, ], 
    [ nil, nil, nil, ], 
-   [ nil, nil, 6, ], 
    [ nil, nil, nil, ], 
    [ nil, nil, nil, ], 
    [ nil, nil, nil, ], 
@@ -291,9 +291,7 @@ end
 
 class D4CSTBuilderExtension_prerulelist::NVAction < Depager::LALR::Action #:nodoc:all
   include Depager::DecoratorUtils
-          include ActionParser
-include ActionParser
-
+  ["        include ActionParser\n", "        include ActionParser\n"]
   on_reduce = [
     nil,
               :_act_0,
@@ -311,9 +309,9 @@ include ActionParser
   end
   
 
-module_eval <<-'.,.,118754107719806.,.,', 'cst.dr', 104
-  def _act_0 val
-    _opt_node, _opt_visitor = *val 
+module_eval <<-'.,.,120998292315579.,.,', 'cst.dr', 104
+def _act_0 val
+    _opt_node, _opt_visitor, = *val 
 
         code = %{
           class Node
@@ -327,43 +325,38 @@ module_eval <<-'.,.,118754107719806.,.,', 'cst.dr', 104
           code.sub!('$$!!@ NODE @!!$$', _opt_node) \
               .sub!('$$!!@ VISITOR @!!$$', _opt_visitor)
 
-  end
-
-.,.,118754107719806.,.,
+end
+.,.,120998292315579.,.,
       
-module_eval <<-'.,.,118754107715644.,.,', 'cst.dr', 119
-  def _act_1 val
+module_eval <<-'.,.,120998292321982.,.,', 'cst.dr', 119
+def _act_1 val
      '' 
 
-  end
-
-.,.,118754107715644.,.,
+end
+.,.,120998292321982.,.,
       
-module_eval <<-'.,.,118754107752569.,.,', 'cst.dr', 120
-  def _act_2 val
-    _NODE, _ACTION = *val 
+module_eval <<-'.,.,120998292319798.,.,', 'cst.dr', 120
+def _act_2 val
+    _NODE, _ACTION, = *val 
      _ACTION.value 
 
-  end
-
-.,.,118754107752569.,.,
+end
+.,.,120998292319798.,.,
       
-module_eval <<-'.,.,118754107761602.,.,', 'cst.dr', 123
-  def _act_3 val
+module_eval <<-'.,.,120998292317944.,.,', 'cst.dr', 123
+def _act_3 val
      '' 
 
-  end
-
-.,.,118754107761602.,.,
+end
+.,.,120998292317944.,.,
       
-module_eval <<-'.,.,118754107741735.,.,', 'cst.dr', 124
-  def _act_4 val
-    _VISITOR, _ACTION = *val 
+module_eval <<-'.,.,120998292323044.,.,', 'cst.dr', 124
+def _act_4 val
+    _VISITOR, _ACTION, = *val 
      _ACTION.value 
 
-  end
-
-.,.,118754107741735.,.,
+end
+.,.,120998292323044.,.,
       
 end
       
@@ -416,9 +409,9 @@ class CSTBuilderExtension_postlhs < Depager::LALR::Basis #:nodoc:all
   ]
   ### Action Table
   action_table = [
-    [ nil, nil, 1, nil, nil, nil, nil, nil, ], 
-    [ nil, nil, nil, nil, nil, 5, nil, nil, ], 
+    [ nil, nil, 2, nil, nil, nil, nil, nil, ], 
     [ ACC, nil, nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, 5, nil, nil, ], 
     [ nil, nil, nil, 6, 7, nil, nil, nil, ], 
     [ nil, nil, nil, nil, nil, nil, nil, nil, ], 
     [ nil, nil, nil, nil, nil, nil, 8, nil, ], 
@@ -469,9 +462,9 @@ class CSTBuilderExtension_postlhs < Depager::LALR::Basis #:nodoc:all
   ]
   ### Goto Table
   goto_table = [ 
-   [ 2, nil, nil, ], 
-   [ nil, 3, 4, ], 
+   [ 1, nil, nil, ], 
    [ nil, nil, nil, ], 
+   [ nil, 3, 4, ], 
    [ nil, nil, nil, ], 
    [ nil, nil, nil, ], 
    [ nil, nil, nil, ], 
@@ -561,8 +554,7 @@ end
 
 class D4CSTBuilderExtension_postlhs::NVAction < Depager::LALR::Action #:nodoc:all
   include Depager::DecoratorUtils
-          include ActionParser
-
+  ["        include ActionParser\n"]
   on_reduce = [
     nil,
               :_act_0,
@@ -580,9 +572,9 @@ class D4CSTBuilderExtension_postlhs::NVAction < Depager::LALR::Action #:nodoc:al
   end
   
 
-module_eval <<-'.,.,118754107847682.,.,', 'cst.dr', 155
-  def _act_0 val
-    _, _pair, _ = *val 
+module_eval <<-'.,.,120998292354439.,.,', 'cst.dr', 155
+def _act_0 val
+    _, _pair, _, = *val 
 
         args = []; code = ''
         _pair.each do |id, lit|
@@ -600,45 +592,40 @@ module_eval <<-'.,.,118754107847682.,.,', 'cst.dr', 155
           end
         }; #code
 
-  end
-
-.,.,118754107847682.,.,
+end
+.,.,120998292354439.,.,
       
-module_eval <<-'.,.,118754107817648.,.,', 'cst.dr', 174
-  def _act_1 val
-    _expr = *val 
+module_eval <<-'.,.,120998292355813.,.,', 'cst.dr', 174
+def _act_1 val
+    _expr, = *val 
      [ _expr ] 
 
-  end
-
-.,.,118754107817648.,.,
+end
+.,.,120998292355813.,.,
       
-module_eval <<-'.,.,118754107822421.,.,', 'cst.dr', 175
-  def _act_2 val
-    _pair, _, _expr = *val 
+module_eval <<-'.,.,120998292324404.,.,', 'cst.dr', 175
+def _act_2 val
+    _pair, _, _expr, = *val 
      _pair << _expr 
 
-  end
-
-.,.,118754107822421.,.,
+end
+.,.,120998292324404.,.,
       
-module_eval <<-'.,.,118754107863218.,.,', 'cst.dr', 178
-  def _act_3 val
-    _ID = *val 
+module_eval <<-'.,.,12099829236180.,.,', 'cst.dr', 178
+def _act_3 val
+    _ID, = *val 
      [ _ID.value, nil] 
 
-  end
-
-.,.,118754107863218.,.,
+end
+.,.,12099829236180.,.,
       
-module_eval <<-'.,.,118754107828193.,.,', 'cst.dr', 179
-  def _act_4 val
-    _ID, _, _LIT = *val 
+module_eval <<-'.,.,12099829233028.,.,', 'cst.dr', 179
+def _act_4 val
+    _ID, _, _LIT, = *val 
      [ _ID.value, _LIT.value ] 
 
-  end
-
-.,.,118754107828193.,.,
+end
+.,.,12099829233028.,.,
       
 end