depager 0.1.9 → 0.2.0

data/lib/depager/atree.rb

@@ -53,7 +53,7 @@ end
 module D4ATreeBuilderExtension_postrhs #:nodoc:all
 end
 
-class ATreeBuilderExtension_postrhs < Basis #:nodoc:all
+class ATreeBuilderExtension_postrhs < Depager::LALR::Basis #:nodoc:all
   include Depager::ExtensionUtils
   
 
@@ -201,30 +201,49 @@ class ATreeBuilderExtension_postrhs < Basis #:nodoc:all
 
           def lex
             begin
-              until @line.empty? do
+              until @line.empty?
                 case @line
-                  when /\A[ \t]+/
-     
-when /\A\n/
-     yield nil, nil 
-when /\A[a-zA-Z][a-zA-Z0-9_]*/
-     yield :ID, Token[$&, lineno] 
-when /\A'(.+)'/
-     yield :STR, Token[$1, lineno] 
-when /\A::/
-     yield :CC, Token[$&, lineno] 
-when /\A=>/
-     yield :EG, Token[$&, lineno] 
-when /\A./
-     yield $&, Token[$&, lineno] 
+                
+          when /\A[ \t]+/
+            @oldline = @line; @line = $'
+                 
 
+        
+          when /\A\n/
+            @oldline = @line; @line = $'
+                 yield nil, nil 
+
+        
+          when /\A[a-zA-Z][a-zA-Z0-9_]*/
+            @oldline = @line; @line = $'
+                 yield :ID, Token[$&, lineno] 
+
+        
+          when /\A'(.+)'/
+            @oldline = @line; @line = $'
+                 yield :STR, Token[$1, lineno] 
+
+        
+          when /\A::/
+            @oldline = @line; @line = $'
+                 yield :CC, Token[$&, lineno] 
+
+        
+          when /\A=>/
+            @oldline = @line; @line = $'
+                 yield :EG, Token[$&, lineno] 
+
+        
+          when /\A./
+            @oldline = @line; @line = $'
+                 yield $&, Token[$&, lineno] 
+
+        
                 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
         
@@ -232,7 +251,7 @@ end
 
 ### Outer Code
 
-class D4ATreeBuilderExtension_postrhs::NVAction < Depager::Action #:nodoc:all
+class D4ATreeBuilderExtension_postrhs::NVAction < Depager::LALR::Action #:nodoc:all
   include Depager::DecoratorUtils
   
   on_reduce = [
@@ -255,7 +274,7 @@ class D4ATreeBuilderExtension_postrhs::NVAction < Depager::Action #:nodoc:all
   end
   
 
-module_eval <<-'.,.,118028145923483.,.,', 'atree.dr', 32
+module_eval <<-'.,.,118754107734084.,.,', 'atree.dr', 32
   def _act_0 val
     _EG, _ast = *val 
 
@@ -266,70 +285,70 @@ module_eval <<-'.,.,118028145923483.,.,', 'atree.dr', 32
 
   end
 
-.,.,118028145923483.,.,
+.,.,118754107734084.,.,
       
-module_eval <<-'.,.,11802814596513.,.,', 'atree.dr', 40
+module_eval <<-'.,.,11875410773078.,.,', 'atree.dr', 40
   def _act_1 val
     _ID, _, _ = *val 
      "[:#{_ID.value}]" 
 
   end
 
-.,.,11802814596513.,.,
+.,.,11875410773078.,.,
       
-module_eval <<-'.,.,1180281459631.,.,', 'atree.dr', 41
+module_eval <<-'.,.,118754107728685.,.,', 'atree.dr', 41
   def _act_2 val
     _ID, _, _fact_list, _ = *val 
      "[:#{_ID.value}, #{_fact_list.join(',')}]" 
 
   end
 
-.,.,1180281459631.,.,
+.,.,118754107728685.,.,
       
-module_eval <<-'.,.,11802814596304.,.,', 'atree.dr', 42
+module_eval <<-'.,.,118754107760030.,.,', 'atree.dr', 42
   def _act_3 val
     _ID = *val 
      "val[#{g_parser.name_to_rhs_index(_ID.value)}]" 
 
   end
 
-.,.,11802814596304.,.,
+.,.,118754107760030.,.,
       
-module_eval <<-'.,.,11802814593265.,.,', 'atree.dr', 45
+module_eval <<-'.,.,118754107732642.,.,', 'atree.dr', 45
   def _act_4 val
     _fact = *val 
      [ _fact ] 
 
   end
 
-.,.,11802814593265.,.,
+.,.,118754107732642.,.,
       
-module_eval <<-'.,.,11802814599160.,.,', 'atree.dr', 46
+module_eval <<-'.,.,118754107753843.,.,', 'atree.dr', 46
   def _act_5 val
     _fact_list, _, _fact = *val 
      _fact_list.push _fact 
 
   end
 
-.,.,11802814599160.,.,
+.,.,118754107753843.,.,
       
-module_eval <<-'.,.,11802814594299.,.,', 'atree.dr', 49
+module_eval <<-'.,.,118754107752237.,.,', 'atree.dr', 49
   def _act_6 val
     _ID = *val 
      "val[#{g_parser.name_to_rhs_index(_ID.value)}]" 
 
   end
 
-.,.,11802814594299.,.,
+.,.,118754107752237.,.,
       
-module_eval <<-'.,.,118028145927897.,.,', 'atree.dr', 50
+module_eval <<-'.,.,118754107722958.,.,', 'atree.dr', 50
   def _act_7 val
     _STR = *val 
      "'#{_STR.value}'" 
 
   end
 
-.,.,118028145927897.,.,
+.,.,118754107722958.,.,
       
 end
       

data/lib/depager/cst.dr

@@ -95,9 +95,9 @@
 
 %LEX{
   /\s+/, /#.*/            { }
-  /%\}\s*\Z/              { @line = $'; yield nil,nil }
+  /%\}\s*\Z/              { yield nil,nil }
   'Node'                  { yield _Token(:NODE, $&) }
-  /\{/                    { ln = lineno; yield _Token(:ACTION, parse_action, ln); //=~'' }
+  '{' !                   { ln = lineno; yield _Token(:ACTION, parse_action, ln) }
 %}
 
 #begin-rule
@@ -117,10 +117,12 @@
               .sub!('$$!!@ VISITOR @!!$$', _opt_visitor)
       }
   ;
-  opt_node:           { '' }
+  opt_node:           
+                      { '' }
     | NODE ACTION     { _ACTION.value }
   ;
-  opt_visitor:        { warn "VIS";'' }
+  opt_visitor:        
+                      { '' }
     | VISITOR ACTION  { _ACTION.value }
   ;
 #end-rule

data/lib/depager/cst.rb

@@ -131,7 +131,7 @@ end
 module D4CSTBuilderExtension_prerulelist #:nodoc:all
 end
 
-class CSTBuilderExtension_prerulelist < Basis #:nodoc:all
+class CSTBuilderExtension_prerulelist < Depager::LALR::Basis #:nodoc:all
   include Depager::ExtensionUtils
   
   include ActionParser
@@ -254,24 +254,34 @@ class CSTBuilderExtension_prerulelist < Basis #:nodoc:all
 
           def lex
             begin
-              until @line.empty? do
+              until @line.empty?
                 case @line
-                  when /\A\s+/, /\A#.*/
-     
-when /\A%\}\s*\Z/
-     @line = $'; yield nil,nil 
-when /\ANode/
-     yield _Token(:NODE, $&) 
-when /\A\{/
-     ln = lineno; yield _Token(:ACTION, parse_action, ln); //=~'' 
+                
+          when /\A\s+/, /\A#.*/
+            @oldline = @line; @line = $'
+                 
 
+        
+          when /\A%\}\s*\Z/
+            @oldline = @line; @line = $'
+                 yield nil,nil 
+
+        
+          when /\ANode/
+            @oldline = @line; @line = $'
+                 yield _Token(:NODE, $&) 
+
+        
+          when /\A\{/
+            #
+                 ln = lineno; yield _Token(:ACTION, parse_action, ln) 
+
+        
                 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
         
@@ -279,7 +289,7 @@ end
 
 ### Outer Code
 
-class D4CSTBuilderExtension_prerulelist::NVAction < Depager::Action #:nodoc:all
+class D4CSTBuilderExtension_prerulelist::NVAction < Depager::LALR::Action #:nodoc:all
   include Depager::DecoratorUtils
           include ActionParser
 include ActionParser
@@ -301,7 +311,7 @@ include ActionParser
   end
   
 
-module_eval <<-'.,.,118028145930197.,.,', 'cst.dr', 104
+module_eval <<-'.,.,118754107719806.,.,', 'cst.dr', 104
   def _act_0 val
     _opt_node, _opt_visitor = *val 
 
@@ -319,41 +329,41 @@ module_eval <<-'.,.,118028145930197.,.,', 'cst.dr', 104
 
   end
 
-.,.,118028145930197.,.,
+.,.,118754107719806.,.,
       
-module_eval <<-'.,.,11802814596438.,.,', 'cst.dr', 118
+module_eval <<-'.,.,118754107715644.,.,', 'cst.dr', 119
   def _act_1 val
      '' 
 
   end
 
-.,.,11802814596438.,.,
+.,.,118754107715644.,.,
       
-module_eval <<-'.,.,118028145919370.,.,', 'cst.dr', 119
+module_eval <<-'.,.,118754107752569.,.,', 'cst.dr', 120
   def _act_2 val
     _NODE, _ACTION = *val 
      _ACTION.value 
 
   end
 
-.,.,118028145919370.,.,
+.,.,118754107752569.,.,
       
-module_eval <<-'.,.,118028145927531.,.,', 'cst.dr', 121
+module_eval <<-'.,.,118754107761602.,.,', 'cst.dr', 123
   def _act_3 val
-     warn "VIS";'' 
+     '' 
 
   end
 
-.,.,118028145927531.,.,
+.,.,118754107761602.,.,
       
-module_eval <<-'.,.,118028145925004.,.,', 'cst.dr', 122
+module_eval <<-'.,.,118754107741735.,.,', 'cst.dr', 124
   def _act_4 val
     _VISITOR, _ACTION = *val 
      _ACTION.value 
 
   end
 
-.,.,118028145925004.,.,
+.,.,118754107741735.,.,
       
 end
       
@@ -364,7 +374,7 @@ end
 module D4CSTBuilderExtension_postlhs #:nodoc:all
 end
 
-class CSTBuilderExtension_postlhs < Basis #:nodoc:all
+class CSTBuilderExtension_postlhs < Depager::LALR::Basis #:nodoc:all
   include Depager::ExtensionUtils
   
   include ActionParser
@@ -505,24 +515,34 @@ class CSTBuilderExtension_postlhs < Basis #:nodoc:all
 
           def lex
             begin
-              until @line.empty? do
+              until @line.empty?
                 case @line
-                  when /\A\A\s+/
-     
-when /\A""/, /\A''/, /\A[0-9]+/, /\A\{\s*\}/, /\A\[\s*\]/, /\Anil/
-     yield _Token(:LIT, $&) 
-when /\A\A[a-z][a-z_]*/
-     yield _Token(:ID, $&)  
-when /\A\A(.)/
-     yield _Token($&, $&)   
+                
+          when /\A\A\s+/
+            @oldline = @line; @line = $'
+                 
 
+        
+          when /\A""/, /\A''/, /\A[0-9]+/, /\A\{\s*\}/, /\A\[\s*\]/, /\Anil/
+            @oldline = @line; @line = $'
+                 yield _Token(:LIT, $&) 
+
+        
+          when /\A\A[a-z][a-z_]*/
+            @oldline = @line; @line = $'
+                 yield _Token(:ID, $&)  
+
+        
+          when /\A\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
           def do_default
@@ -539,7 +559,7 @@ end
 
 ### Outer Code
 
-class D4CSTBuilderExtension_postlhs::NVAction < Depager::Action #:nodoc:all
+class D4CSTBuilderExtension_postlhs::NVAction < Depager::LALR::Action #:nodoc:all
   include Depager::DecoratorUtils
           include ActionParser
 
@@ -560,7 +580,7 @@ class D4CSTBuilderExtension_postlhs::NVAction < Depager::Action #:nodoc:all
   end
   
 
-module_eval <<-'.,.,118028145927473.,.,', 'cst.dr', 153
+module_eval <<-'.,.,118754107847682.,.,', 'cst.dr', 155
   def _act_0 val
     _, _pair, _ = *val 
 
@@ -582,43 +602,43 @@ module_eval <<-'.,.,118028145927473.,.,', 'cst.dr', 153
 
   end
 
-.,.,118028145927473.,.,
+.,.,118754107847682.,.,
       
-module_eval <<-'.,.,118028145920598.,.,', 'cst.dr', 172
+module_eval <<-'.,.,118754107817648.,.,', 'cst.dr', 174
   def _act_1 val
     _expr = *val 
      [ _expr ] 
 
   end
 
-.,.,118028145920598.,.,
+.,.,118754107817648.,.,
       
-module_eval <<-'.,.,11802814597299.,.,', 'cst.dr', 173
+module_eval <<-'.,.,118754107822421.,.,', 'cst.dr', 175
   def _act_2 val
     _pair, _, _expr = *val 
      _pair << _expr 
 
   end
 
-.,.,11802814597299.,.,
+.,.,118754107822421.,.,
       
-module_eval <<-'.,.,118028145933452.,.,', 'cst.dr', 176
+module_eval <<-'.,.,118754107863218.,.,', 'cst.dr', 178
   def _act_3 val
     _ID = *val 
      [ _ID.value, nil] 
 
   end
 
-.,.,118028145933452.,.,
+.,.,118754107863218.,.,
       
-module_eval <<-'.,.,118028145946002.,.,', 'cst.dr', 177
+module_eval <<-'.,.,118754107828193.,.,', 'cst.dr', 179
   def _act_4 val
     _ID, _, _LIT = *val 
      [ _ID.value, _LIT.value ] 
 
   end
 
-.,.,118028145946002.,.,
+.,.,118754107828193.,.,
       
 end