depager 0.2.2 → 0.2.3

data/examples/sample_calc/calc.tab.rb

@@ -50,25 +50,26 @@ class TinyCalc < Depager::LALR::Basis
   ]
   ### Action Table
   action_table = [
-    [ nil, nil, nil, nil, nil, nil, 4, 5, nil, ], 
-    [ ACC, nil, 6, 7, nil, nil, nil, nil, nil, ], 
-    [ nil, nil, nil, nil, 8, 9, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, 5, 1, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, 5, 1, nil, ], 
+    [ ACC, nil, 7, 8, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, 9, 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, nil, 4, 5, nil, ], 
-    [ nil, nil, nil, nil, nil, nil, 4, 5, nil, ], 
-    [ nil, nil, nil, nil, nil, nil, 4, 5, nil, ], 
-    [ nil, nil, nil, nil, nil, nil, 4, 5, nil, ], 
-    [ nil, nil, nil, nil, nil, nil, 4, 5, nil, ], 
-    [ nil, nil, 6, 7, nil, nil, nil, nil, 15, ], 
-    [ nil, nil, nil, nil, 8, 9, nil, nil, nil, ], 
-    [ nil, nil, nil, nil, 8, 9, nil, nil, nil, ], 
+    [ nil, nil, 7, 8, nil, nil, nil, nil, 11, ], 
+    [ nil, nil, nil, nil, nil, nil, 5, 1, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, 5, 1, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, 5, 1, nil, ], 
+    [ nil, nil, nil, nil, nil, nil, 5, 1, nil, ], 
     [ nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, 9, 10, nil, nil, nil, ], 
+    [ nil, nil, nil, nil, 9, 10, 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 = [
+    nil, 
     nil, 
     nil, 
     -3, 
@@ -79,17 +80,17 @@ class TinyCalc < Depager::LALR::Basis
     nil, 
     nil, 
     nil, 
-    nil, 
+    -8, 
     -1, 
     -2, 
     -4, 
     -5, 
-    -8, 
   ]
   defred_after_shift_table = [
     nil, 
     nil, 
     nil, 
+    nil, 
     -6, 
     -7, 
     nil, 
@@ -97,12 +98,11 @@ class TinyCalc < Depager::LALR::Basis
     nil, 
     nil, 
     nil, 
-    nil, 
+    -8, 
     nil, 
     nil, 
     -4, 
     -5, 
-    -8, 
   ]
   ### Nonterm to Int
   nt2i = { 
@@ -118,17 +118,17 @@ class TinyCalc < Depager::LALR::Basis
   ]
   ### Goto Table
   goto_table = [ 
-   [ 1, 2, 3, ], 
+   [ 2, 3, 4, ], 
+   [ 6, 3, 4, ], 
    [ nil, nil, nil, ], 
    [ nil, nil, nil, ], 
    [ nil, nil, nil, ], 
    [ nil, nil, nil, ], 
-   [ 10, 2, 3, ], 
-   [ nil, 11, 3, ], 
-   [ nil, 12, 3, ], 
-   [ nil, nil, 13, ], 
-   [ nil, nil, 14, ], 
    [ nil, nil, nil, ], 
+   [ nil, 12, 4, ], 
+   [ nil, 13, 4, ], 
+   [ nil, nil, 14, ], 
+   [ nil, nil, 15, ], 
    [ nil, nil, nil, ], 
    [ nil, nil, nil, ], 
    [ nil, nil, nil, ], 
@@ -149,20 +149,30 @@ class TinyCalc < Depager::LALR::Basis
 I000 = 
   (  0) $start : _ expr
 
-  NUM             shift, and goto to state 4
-  '('             shift, and goto to state 5
+  NUM             shift, and goto to state 5
+  '('             shift, and goto to state 1
 
 
 ----------
   
 <<'----------',
 I001 = 
+  (  8) fact : '(' _ expr ')'
+
+  NUM             shift, and goto to state 5
+  '('             shift, and goto to state 1
+
+
+----------
+  
+<<'----------',
+I002 = 
   (  0) $start : expr _
   (  1) expr : expr _ '+' term
   (  2) expr : expr _ '-' term
 
-  '+'             shift, and goto to state 6
-  '-'             shift, and goto to state 7
+  '+'             shift, and goto to state 7
+  '-'             shift, and goto to state 8
 
 
   $end            accept
@@ -170,20 +180,20 @@ I001 =
 ----------
   
 <<'----------',
-I002 = 
+I003 = 
   (  3) expr : term _
   (  4) term : term _ '*' fact
   (  5) term : term _ '/' fact
 
-  '*'             shift, and goto to state 8
-  '/'             shift, and goto to state 9
+  '*'             shift, and goto to state 9
+  '/'             shift, and goto to state 10
 
   $default       reduce using rule 3 (expr) 
 
 ----------
   
 <<'----------',
-I003 = 
+I004 = 
   (  6) term : fact _
 
 
@@ -192,7 +202,7 @@ I003 =
 ----------
   
 <<'----------',
-I004 = 
+I005 = 
   (  7) fact : NUM _
 
 
@@ -201,96 +211,95 @@ I004 =
 ----------
   
 <<'----------',
-I005 = 
-  (  8) fact : '(' _ expr ')'
+I006 = 
+  (  8) fact : '(' expr _ ')'
+  (  1) expr : expr _ '+' term
+  (  2) expr : expr _ '-' term
 
-  NUM             shift, and goto to state 4
-  '('             shift, and goto to state 5
+  '+'             shift, and goto to state 7
+  '-'             shift, and goto to state 8
+  ')'             shift, and goto to state 11
 
 
 ----------
   
 <<'----------',
-I006 = 
+I007 = 
   (  1) expr : expr '+' _ term
 
-  NUM             shift, and goto to state 4
-  '('             shift, and goto to state 5
+  NUM             shift, and goto to state 5
+  '('             shift, and goto to state 1
 
 
 ----------
   
 <<'----------',
-I007 = 
+I008 = 
   (  2) expr : expr '-' _ term
 
-  NUM             shift, and goto to state 4
-  '('             shift, and goto to state 5
+  NUM             shift, and goto to state 5
+  '('             shift, and goto to state 1
 
 
 ----------
   
 <<'----------',
-I008 = 
+I009 = 
   (  4) term : term '*' _ fact
 
-  NUM             shift, and goto to state 4
-  '('             shift, and goto to state 5
+  NUM             shift, and goto to state 5
+  '('             shift, and goto to state 1
 
 
 ----------
   
 <<'----------',
-I009 = 
+I010 = 
   (  5) term : term '/' _ fact
 
-  NUM             shift, and goto to state 4
-  '('             shift, and goto to state 5
+  NUM             shift, and goto to state 5
+  '('             shift, and goto to state 1
 
 
 ----------
   
 <<'----------',
-I010 = 
-  (  8) fact : '(' expr _ ')'
-  (  1) expr : expr _ '+' term
-  (  2) expr : expr _ '-' term
+I011 = 
+  (  8) fact : '(' expr ')' _
 
-  '+'             shift, and goto to state 6
-  '-'             shift, and goto to state 7
-  ')'             shift, and goto to state 15
 
+  $default       reduce using rule 8 (fact)  [after shift]
 
 ----------
   
 <<'----------',
-I011 = 
+I012 = 
   (  1) expr : expr '+' term _
   (  4) term : term _ '*' fact
   (  5) term : term _ '/' fact
 
-  '*'             shift, and goto to state 8
-  '/'             shift, and goto to state 9
+  '*'             shift, and goto to state 9
+  '/'             shift, and goto to state 10
 
   $default       reduce using rule 1 (expr) 
 
 ----------
   
 <<'----------',
-I012 = 
+I013 = 
   (  2) expr : expr '-' term _
   (  4) term : term _ '*' fact
   (  5) term : term _ '/' fact
 
-  '*'             shift, and goto to state 8
-  '/'             shift, and goto to state 9
+  '*'             shift, and goto to state 9
+  '/'             shift, and goto to state 10
 
   $default       reduce using rule 2 (expr) 
 
 ----------
   
 <<'----------',
-I013 = 
+I014 = 
   (  4) term : term '*' fact _
 
 
@@ -299,21 +308,12 @@ I013 =
 ----------
   
 <<'----------',
-I014 = 
+I015 = 
   (  5) term : term '/' fact _
 
 
   $default       reduce using rule 5 (term)  [after shift]
 
-----------
-  
-<<'----------',
-I015 = 
-  (  8) fact : '(' expr ')' _
-
-
-  $default       reduce using rule 8 (fact)  [after shift]
-
 ----------
   ]
 
@@ -360,6 +360,6 @@ end
 if __FILE__ == $0
 ### Main Code
 parser = TinyCalc.new()
-parser.yyparse(STDIN)
+parser.parse(STDIN)
 
 end

data/examples/sample_calc/calc_prec.nvaction.dr

@@ -1,8 +1,8 @@
 %class TinyCalc
-%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')
 %prec{
   left '*' '/'
   left '+' '-'
@@ -11,8 +11,8 @@
 
 %LEX{
   /\s+/, /\#.*/ { }
-  /[1-9][0-9]*/ { yield _Token(:NUM, $&.to_i) }
-  /./           { yield _Token($&, $&) }
+  /[1-9][0-9]*/ { yield token(:NUM, $&.to_i) }
+  /./           { yield token($&, $&) }
 %}
 
 #begin-rule
@@ -27,5 +27,5 @@
 #end-rule
 %%
 parser = createDecoratedTinyCalc
-r, = parser.yyparse(STDIN)
+r, = parser.parse(STDIN)
 puts r

data/examples/sample_calc/calc_prec.nvaction.tab.rb

@@ -50,18 +50,18 @@ class TinyCalc < Depager::LALR::Basis
   ### Action Table
   action_table = [
     [ nil, nil, nil, nil, nil, nil, 2, nil, 3, ], 
-    [ ACC, nil, 4, 5, 6, 7, nil, nil, nil, ], 
+    [ ACC, nil, 7, 4, 5, 6, nil, nil, nil, ], 
     [ nil, nil, nil, nil, nil, nil, 2, nil, 3, ], 
     [ nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
     [ nil, nil, nil, nil, nil, nil, 2, nil, 3, ], 
     [ nil, nil, nil, nil, nil, nil, 2, nil, 3, ], 
     [ nil, nil, nil, nil, nil, nil, 2, nil, 3, ], 
     [ nil, nil, nil, nil, nil, nil, 2, nil, 3, ], 
-    [ nil, nil, 4, 5, 6, 7, nil, 13, nil, ], 
-    [ nil, nil, nil, nil, 6, 7, nil, nil, nil, ], 
-    [ nil, nil, nil, nil, 6, 7, nil, nil, nil, ], 
+    [ nil, nil, 7, 4, 5, 6, nil, 13, nil, ], 
+    [ nil, nil, nil, 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, 5, 6, nil, nil, nil, ], 
     [ nil, nil, nil, nil, nil, nil, nil, nil, nil, ], 
   ]
   ### Default Reduce Table
@@ -75,10 +75,10 @@ class TinyCalc < Depager::LALR::Basis
     nil, 
     nil, 
     nil, 
-    -1, 
     -2, 
     -3, 
     -4, 
+    -1, 
     -5, 
   ]
   defred_after_shift_table = [
@@ -92,9 +92,9 @@ class TinyCalc < Depager::LALR::Basis
     nil, 
     nil, 
     nil, 
-    nil, 
     -3, 
     -4, 
+    nil, 
     -5, 
   ]
   ### Nonterm to Int
@@ -150,10 +150,10 @@ I001 =
   (  3) expr : expr _ '*' expr
   (  4) expr : expr _ '/' expr
 
-  '+'             shift, and goto to state 4
-  '-'             shift, and goto to state 5
-  '*'             shift, and goto to state 6
-  '/'             shift, and goto to state 7
+  '+'             shift, and goto to state 7
+  '-'             shift, and goto to state 4
+  '*'             shift, and goto to state 5
+  '/'             shift, and goto to state 6
 
 
   $end            accept
@@ -181,7 +181,7 @@ I003 =
   
 <<'----------',
 I004 = 
-  (  1) expr : expr '+' _ expr
+  (  2) expr : expr '-' _ expr
 
   '('             shift, and goto to state 2
   NUM             shift, and goto to state 3
@@ -191,7 +191,7 @@ I004 =
   
 <<'----------',
 I005 = 
-  (  2) expr : expr '-' _ expr
+  (  3) expr : expr '*' _ expr
 
   '('             shift, and goto to state 2
   NUM             shift, and goto to state 3
@@ -201,7 +201,7 @@ I005 =
   
 <<'----------',
 I006 = 
-  (  3) expr : expr '*' _ expr
+  (  4) expr : expr '/' _ expr
 
   '('             shift, and goto to state 2
   NUM             shift, and goto to state 3
@@ -211,7 +211,7 @@ I006 =
   
 <<'----------',
 I007 = 
-  (  4) expr : expr '/' _ expr
+  (  1) expr : expr '+' _ expr
 
   '('             shift, and goto to state 2
   NUM             shift, and goto to state 3
@@ -227,10 +227,10 @@ I008 =
   (  3) expr : expr _ '*' expr
   (  4) expr : expr _ '/' expr
 
-  '+'             shift, and goto to state 4
-  '-'             shift, and goto to state 5
-  '*'             shift, and goto to state 6
-  '/'             shift, and goto to state 7
+  '+'             shift, and goto to state 7
+  '-'             shift, and goto to state 4
+  '*'             shift, and goto to state 5
+  '/'             shift, and goto to state 6
   ')'             shift, and goto to state 13
 
 
@@ -238,57 +238,57 @@ I008 =
   
 <<'----------',
 I009 = 
-  (  1) expr : expr '+' expr _
+  (  2) expr : expr '-' expr _
   (  1) expr : expr _ '+' expr
   (  2) expr : expr _ '-' expr
   (  3) expr : expr _ '*' expr
   (  4) expr : expr _ '/' expr
 
-  '*'             shift, and goto to state 6
-  '/'             shift, and goto to state 7
+  '*'             shift, and goto to state 5
+  '/'             shift, and goto to state 6
 
-  $default       reduce using rule 1 (expr) 
+  $default       reduce using rule 2 (expr) 
 
 ----------
   
 <<'----------',
 I010 = 
-  (  2) expr : expr '-' expr _
+  (  3) expr : expr '*' expr _
   (  1) expr : expr _ '+' expr
   (  2) expr : expr _ '-' expr
   (  3) expr : expr _ '*' expr
   (  4) expr : expr _ '/' expr
 
-  '*'             shift, and goto to state 6
-  '/'             shift, and goto to state 7
 
-  $default       reduce using rule 2 (expr) 
+  $default       reduce using rule 3 (expr)  [after shift]
 
 ----------
   
 <<'----------',
 I011 = 
-  (  3) expr : expr '*' expr _
+  (  4) expr : expr '/' expr _
   (  1) expr : expr _ '+' expr
   (  2) expr : expr _ '-' expr
   (  3) expr : expr _ '*' expr
   (  4) expr : expr _ '/' expr
 
 
-  $default       reduce using rule 3 (expr)  [after shift]
+  $default       reduce using rule 4 (expr)  [after shift]
 
 ----------
   
 <<'----------',
 I012 = 
-  (  4) expr : expr '/' expr _
+  (  1) expr : expr '+' expr _
   (  1) expr : expr _ '+' expr
   (  2) expr : expr _ '-' expr
   (  3) expr : expr _ '*' expr
   (  4) expr : expr _ '/' expr
 
+  '*'             shift, and goto to state 5
+  '/'             shift, and goto to state 6
 
-  $default       reduce using rule 4 (expr)  [after shift]
+  $default       reduce using rule 1 (expr) 
 
 ----------
   
@@ -325,12 +325,12 @@ I013 =
         
           when /\A[1-9][0-9]*/
             @oldline = @line; @line = $'
-                 yield _Token(:NUM, $&.to_i) 
+                 yield token(:NUM, $&.to_i) 
 
         
           when /\A./
             @oldline = @line; @line = $'
-                 yield _Token($&, $&) 
+                 yield token($&, $&) 
 
         
                 else
@@ -347,7 +347,7 @@ end
 
 class D4TinyCalc::NVAction < Depager::LALR::Action #:nodoc:all
   include Depager::DecoratorUtils
-  []
+  
   on_reduce = [
     nil,
               :_act_0,
@@ -366,53 +366,53 @@ class D4TinyCalc::NVAction < Depager::LALR::Action #:nodoc:all
   end
   
 
-module_eval <<-'.,.,120998293532945.,.,', 'sample_calc/calc_prec.nvaction.dr', 18
+module_eval <<-'.,.,122745803936127.,.,', 'sample_calc/calc_prec.nvaction.dr', 18
 def _act_0 val
     _left, _, _right, = *val 
      _left + _right 
 
 end
-.,.,120998293532945.,.,
+.,.,122745803936127.,.,
       
-module_eval <<-'.,.,120998293512295.,.,', 'sample_calc/calc_prec.nvaction.dr', 19
+module_eval <<-'.,.,122745803916018.,.,', 'sample_calc/calc_prec.nvaction.dr', 19
 def _act_1 val
     _left, _, _right, = *val 
      _left - _right 
 
 end
-.,.,120998293512295.,.,
+.,.,122745803916018.,.,
       
-module_eval <<-'.,.,120998293533739.,.,', 'sample_calc/calc_prec.nvaction.dr', 20
+module_eval <<-'.,.,122745803947193.,.,', 'sample_calc/calc_prec.nvaction.dr', 20
 def _act_2 val
     _left, _, _right, = *val 
      _left * _right 
 
 end
-.,.,120998293533739.,.,
+.,.,122745803947193.,.,
       
-module_eval <<-'.,.,120998293551299.,.,', 'sample_calc/calc_prec.nvaction.dr', 21
+module_eval <<-'.,.,122745803925953.,.,', 'sample_calc/calc_prec.nvaction.dr', 21
 def _act_3 val
     _left, _, _right, = *val 
      _left / _right 
 
 end
-.,.,120998293551299.,.,
+.,.,122745803925953.,.,
       
-module_eval <<-'.,.,120998293522595.,.,', 'sample_calc/calc_prec.nvaction.dr', 22
+module_eval <<-'.,.,122745803965385.,.,', 'sample_calc/calc_prec.nvaction.dr', 22
 def _act_4 val
     _, _expr, _, = *val 
      _expr 
 
 end
-.,.,120998293522595.,.,
+.,.,122745803965385.,.,
       
-module_eval <<-'.,.,120998293547470.,.,', 'sample_calc/calc_prec.nvaction.dr', 23
+module_eval <<-'.,.,12274580397259.,.,', 'sample_calc/calc_prec.nvaction.dr', 23
 def _act_5 val
     _NUM, = *val 
      _NUM.value 
 
 end
-.,.,120998293547470.,.,
+.,.,12274580397259.,.,
       
 end
       
@@ -425,7 +425,7 @@ end
 if __FILE__ == $0
 ### Main Code
 parser = createDecoratedTinyCalc
-r, = parser.yyparse(STDIN)
+r, = parser.parse(STDIN)
 puts r
 
 end