depager 0.2.2 → 0.2.3

data/examples/slex_test/divreg.slex.dr

@@ -1,17 +1,17 @@
 %class StatefulLexerTest1
-%extend StatefulLexer ('depager/slex.rb')
-%extend NVAction ('depager/nvaction.rb')
+%extend StatefulLexer ('plugins/slex.rb')
+%extend NVAction ('plugins/nvaction.rb')
 %decorate @NVAction
 %decorate @StatefulLexer
-#%decorate ShiftReducePrinter ('depager/srp.rb')
+#%decorate ShiftReducePrinter ('plugins/srp.rb')
 %%
 %LEX{
   <START>
   /\s+/                   { }
-  /\/(([^\/\\]+|\\.)*)\// { yield _Token(:REGEXP, $&) }
-  /./                     { yield _Token($&, $&) }
+  /\/(([^\/\\]+|\\.)*)\// { yield token(:REGEXP, $&) }
+  /./                     { yield token($&, $&) }
   <OPMODE : START>
-  '/'                     { yield _Token($&, $&) }
+  '/'                     { yield token($&, $&) }
 %}
 
 #begin-rule
@@ -26,4 +26,4 @@
 #end-rule
 %%
 p = createDecoratedStatefulLexerTest1
-p.yyparse(STDIN)
+p.parse(STDIN)

data/examples/slex_test/divreg.slex.tab.rb

@@ -19,8 +19,8 @@ class StatefulLexerTest1 < Depager::LALR::Basis
   ]
   ### Extension Params
   nparams = {
-    'StatefulLexer' => 2, 
     'NVAction' => 3, 
+    'StatefulLexer' => 2, 
   }
   ### Term to Int
   t2i = {
@@ -38,20 +38,20 @@ class StatefulLexerTest1 < Depager::LALR::Basis
   ]
   ### Action Table
   action_table = [
-    [ nil, nil, nil, 3, ], 
+    [ nil, nil, nil, 2, ], 
     [ ACC, nil, 4, nil, ], 
     [ nil, nil, nil, nil, ], 
     [ nil, nil, nil, nil, ], 
     [ nil, nil, nil, nil, ], 
-    [ nil, nil, nil, 3, ], 
+    [ nil, nil, nil, 2, ], 
     [ nil, nil, nil, nil, ], 
   ]
   ### Default Reduce Table
   defred_table = [
     nil, 
     nil, 
-    -2, 
     -4, 
+    -2, 
     -3, 
     nil, 
     -1, 
@@ -59,8 +59,8 @@ class StatefulLexerTest1 < Depager::LALR::Basis
   defred_after_shift_table = [
     nil, 
     nil, 
-    -2, 
     -4, 
+    -2, 
     -3, 
     nil, 
     -1, 
@@ -79,7 +79,7 @@ class StatefulLexerTest1 < Depager::LALR::Basis
   ]
   ### Goto Table
   goto_table = [ 
-   [ 1, 2, nil, ], 
+   [ 1, 3, nil, ], 
    [ nil, nil, nil, ], 
    [ nil, nil, nil, ], 
    [ nil, nil, nil, ], 
@@ -101,7 +101,7 @@ class StatefulLexerTest1 < Depager::LALR::Basis
 I000 = 
   (  0) $start : _ expr
 
-  REGEXP          shift, and goto to state 3
+  REGEXP          shift, and goto to state 2
 
 
 ----------
@@ -120,19 +120,19 @@ I001 =
   
 <<'----------',
 I002 = 
-  (  2) expr : fact _
+  (  4) fact : REGEXP _
 
 
-  $default       reduce using rule 2 (expr)  [after shift]
+  $default       reduce using rule 4 (fact)  [after shift]
 
 ----------
   
 <<'----------',
 I003 = 
-  (  4) fact : REGEXP _
+  (  2) expr : fact _
 
 
-  $default       reduce using rule 4 (fact)  [after shift]
+  $default       reduce using rule 2 (expr)  [after shift]
 
 ----------
   
@@ -149,7 +149,7 @@ I004 =
 I005 = 
   (  1) expr : expr '/' __expr_0_2__ _ fact
 
-  REGEXP          shift, and goto to state 3
+  REGEXP          shift, and goto to state 2
 
 
 ----------
@@ -185,12 +185,12 @@ I006 =
         
           when /\A\/(([^\/\\]+|\\.)*)\//
             @oldline = @line; @line = $'
-                 yield _Token(:REGEXP, $&) 
+                 yield token(:REGEXP, $&) 
 
         
           when /\A./
             @oldline = @line; @line = $'
-                 yield _Token($&, $&) 
+                 yield token($&, $&) 
 
         
               else
@@ -203,7 +203,7 @@ I006 =
                 
           when /\A\//
             @oldline = @line; @line = $'
-                 yield _Token($&, $&) 
+                 yield token($&, $&) 
 
         
               else
@@ -229,7 +229,7 @@ end
 
 class D4StatefulLexerTest1::StatefulLexer < Depager::LALR::Action #:nodoc:all
   include Depager::DecoratorUtils
-  []
+  
   on_reduce = [
     nil,
               nil,
@@ -262,7 +262,7 @@ end
       
 class D4StatefulLexerTest1::NVAction < Depager::LALR::Action #:nodoc:all
   include Depager::DecoratorUtils
-  []
+  
   on_reduce = [
     nil,
               nil,
@@ -279,13 +279,13 @@ class D4StatefulLexerTest1::NVAction < Depager::LALR::Action #:nodoc:all
   end
   
 
-module_eval <<-'.,.,120998293627530.,.,', 'slex_test/divreg.slex.dr', 22
+module_eval <<-'.,.,122745804061258.,.,', 'slex_test/divreg.slex.dr', 22
 def _act_3 val
     _REGEXP, = *val 
      warn "REGEXP: #{_REGEXP.value}" 
 
 end
-.,.,120998293627530.,.,
+.,.,122745804061258.,.,
       
 end
       
@@ -298,6 +298,6 @@ end
 if __FILE__ == $0
 ### Main Code
 p = createDecoratedStatefulLexerTest1
-p.yyparse(STDIN)
+p.parse(STDIN)
 
 end

data/examples/slex_test/ljoin.slex.dr

@@ -1,16 +1,16 @@
 %class StatefulLexerTest2
-%extend StatefulLexer ('depager/slex.rb')
-%extend NVAction ('depager/nvaction.rb')
+%extend StatefulLexer ('plugins/slex.rb')
+%extend NVAction ('plugins/nvaction.rb')
 %decorate @NVAction
 %decorate @StatefulLexer
-#%decorate ShiftReducePrinter ('depager/srp.rb')
+#%decorate ShiftReducePrinter ('plugins/srp.rb')
 %%
 %LEX{
   <START>
   /[ \t]+/ { }
-  /\n/     { yield _Token(:EOL, $&) }
-  /\w+/    { yield _Token(:ID,  $&) }
-  /./      { yield _Token($&,   $&) }
+  /\n/     { yield token(:EOL, $&) }
+  /\w+/    { yield token(:ID,  $&) }
+  /./      { yield token($&,   $&) }
   <LCONT : START>
   /\r?\n/  { }
 %}
@@ -33,4 +33,4 @@
 #end-rule
 %%
 p = createDecoratedStatefulLexerTest2
-p.yyparse(STDIN)
+p.parse(STDIN)

data/examples/slex_test/ljoin.slex.tab.rb

@@ -21,8 +21,8 @@ class StatefulLexerTest2 < Depager::LALR::Basis
   ]
   ### Extension Params
   nparams = {
-    'StatefulLexer' => 2, 
     'NVAction' => 3, 
+    'StatefulLexer' => 2, 
   }
   ### Term to Int
   t2i = {
@@ -219,17 +219,17 @@ I008 =
         
           when /\A\n/
             @oldline = @line; @line = $'
-                 yield _Token(:EOL, $&) 
+                 yield token(:EOL, $&) 
 
         
           when /\A\w+/
             @oldline = @line; @line = $'
-                 yield _Token(:ID,  $&) 
+                 yield token(:ID,  $&) 
 
         
           when /\A./
             @oldline = @line; @line = $'
-                 yield _Token($&,   $&) 
+                 yield token($&,   $&) 
 
         
               else
@@ -268,7 +268,7 @@ end
 
 class D4StatefulLexerTest2::StatefulLexer < Depager::LALR::Action #:nodoc:all
   include Depager::DecoratorUtils
-  []
+  
   on_reduce = [
     nil,
               nil,
@@ -303,7 +303,7 @@ end
       
 class D4StatefulLexerTest2::NVAction < Depager::LALR::Action #:nodoc:all
   include Depager::DecoratorUtils
-  []
+  
   on_reduce = [
     nil,
               nil,
@@ -322,37 +322,37 @@ class D4StatefulLexerTest2::NVAction < Depager::LALR::Action #:nodoc:all
   end
   
 
-module_eval <<-'.,.,120998293621426.,.,', 'slex_test/ljoin.slex.dr', 19
+module_eval <<-'.,.,12274580401395.,.,', 'slex_test/ljoin.slex.dr', 19
 def _act_1 val
     _stmts, _expr, _EOL, = *val 
      warn "#{_expr} <EOL>:#{@lexstate}" 
 
 end
-.,.,120998293621426.,.,
+.,.,12274580401395.,.,
       
-module_eval <<-'.,.,120998293623094.,.,', 'slex_test/ljoin.slex.dr', 23
+module_eval <<-'.,.,1227458040182.,.,', 'slex_test/ljoin.slex.dr', 23
 def _act_2 val
     _expr, _, ___expr_0_2__, _fact, = *val 
      "#{_expr} + #{_fact}" 
 
 end
-.,.,120998293623094.,.,
+.,.,1227458040182.,.,
       
-module_eval <<-'.,.,120998293640556.,.,', 'slex_test/ljoin.slex.dr', 25
+module_eval <<-'.,.,122745804061311.,.,', 'slex_test/ljoin.slex.dr', 25
 def _act_3 val
     _fact, = *val 
      _fact 
 
 end
-.,.,120998293640556.,.,
+.,.,122745804061311.,.,
       
-module_eval <<-'.,.,120998293664604.,.,', 'slex_test/ljoin.slex.dr', 29
+module_eval <<-'.,.,122745804033944.,.,', 'slex_test/ljoin.slex.dr', 29
 def _act_5 val
     _ID, = *val 
      _ID.value 
 
 end
-.,.,120998293664604.,.,
+.,.,122745804033944.,.,
       
 end
       
@@ -365,6 +365,6 @@ end
 if __FILE__ == $0
 ### Main Code
 p = createDecoratedStatefulLexerTest2
-p.yyparse(STDIN)
+p.parse(STDIN)
 
 end

data/lib/depager.rb

@@ -4,7 +4,9 @@ require "depager/grammar.rb"
 require "depager/utils.rb"
 
 module Depager
-  Tmpldir = File.expand_path "#{File.dirname(__FILE__)}/depager/template"
+  LIBDIR  = File.expand_path "#{File.dirname(__FILE__)}/depager/ruby"
+  Tmpldir = "#{LIBDIR}/templates"
+  $LOAD_PATH.unshift LIBDIR
 
   #
   # file manager 
@@ -121,11 +123,21 @@ module Depager
   #
   class GrammarParser
     include FileUtils
+
+    HOOK_KEYS = [
+      :pre_rule_list, :post_rule_list,
+      :pre_rule, :post_rule,
+      :post_lhs,
+      :post_rhs_list, :pre_rhs_list,
+      :pre_rhs, :post_rhs, :post_symbol
+    ] #:nodoc:
+    def self.hook_name? s
+      HOOK_KEYS.include? s.to_sym
+    end
+
     def files
       @d_parser.files
     end
-    alias file files
-    alias f files
 
     private
     GToken = Struct.new(:tag, :value, :name, :lineno)
@@ -135,18 +147,18 @@ module Depager
     end
     def parse_grammar
       gettoken
-      preRuleList
+      do_hook :pre_rule_list
       parse_rulelist
-      postRuleList
+      do_hook :post_rule_list
       unless @token.tag == nil
         error_exit "syntax error(grammar). "<<
           "unexpected '#{@token.tag}' expect '%%'"
       end
     end
     def parse_rulelist
-      preRule
+      do_hook :pre_rule
       parse_rule
-      postRule
+      do_hook :post_rule
       if @token.tag == :NT
         parse_rulelist
       end
@@ -156,7 +168,7 @@ module Depager
         @lhs = @token.value
 
         gettoken
-        postLhs
+        do_hook :post_lhs
 
         unless  @token.tag == ':'
           error_exit "syntax error(grammar). "<<
@@ -165,13 +177,13 @@ module Depager
         gettoken
 
         @nrhs = 0
-        preRhsList
+        do_hook :pre_rhs_list
         parse_rhslist
-        postRhsList
+        do_hook :post_rhs_list
 
         unless @token.tag == ';'
           error_exit "syntax error(grammar). " <<
-            "unexpected '#{@token[0]}' expecting ';'"
+            "unexpected '#{@token.tag}' expecting ';'"
         end
         gettoken
       end
@@ -179,10 +191,10 @@ module Depager
     def parse_rhslist
       @rhs = []; @rhsni = {}; @prec = nil
       @optval = Array.new(@nparam)
-      preRhs
+      do_hook :pre_rhs
       parse_syms
       add_rule(@lhs, @rhs, @prec)
-      postRhs
+      do_hook :post_rhs
       @nrhs += 1
 
       if @token.tag == '|'
@@ -195,12 +207,11 @@ module Depager
         rhs_insert_sym(-1, @token.value, @token.name)
         gettoken
 
-        postSymbol
+        do_hook :post_symbol
         parse_syms
       end
     end
 
-    public
     def gettoken
       while !@line.empty? || !eof?
         if @line.empty?
@@ -235,11 +246,11 @@ module Depager
             val = @terms[s] ||=  - (@terms.size + 1)
           when /^%%/
             return _GToken(nil, nil)
-          when /^(.)/
+          when /^([:;|])/
             tag = $&
             val = $&
           else
-            raise RuntimeError, "must not happen #{line}"
+            return _GToken(:UNKNOWN, @line[0].chr)
           end
           @oldline = @line; @line = $'
           @i2s[val] ||= s if val && s
@@ -250,38 +261,17 @@ module Depager
     end
 
     private
-    def preRuleList
-      @prerulelist.each{|o, m| o.send m}
-    end
-    def postRuleList
-      @postrulelist.each{|o, m| o.send m}
-    end
-    def preRule
-      @prerule.each{|o, m| o.send m}
-    end
-    def postRule
-      @postrule.each{|o, m| o.send m}
-    end
-    def postLhs
-      @postlhs.each{|o, m| o.send(m)}
-    end
-    def preRhsList
-      @prerhslist.each{|o, m| o.send m}
-    end
-    def postRhsList
-      @postrhslist.each{|o, m| o.send m}
-    end
-    def preRhs
-      @prerhs.each{|o, m| o.send(m)}
-    end
-    def postRhs
-      @postrhs.each{|o, m| o.send(m)}
-    end
-    def postSymbol
-      @postsymbol.each{|o, m| o.send(m)}
+    def do_hook hook
+      @hooks[hook].each{|o, m| o.send m}
     end
 
     public
+    # update line and get token
+    def update_context line
+      @line = line
+      gettoken
+    end
+
     # get number of param
     def getnparam a = nil
       return nil unless a
@@ -335,14 +325,11 @@ module Depager
       end
     end
 
-    attr_accessor :rules, :terms, :nonterms, :precs
+    attr_accessor :rules, :terms, :nonterms, :precs, :table
     attr_accessor :line, :line0, :oldline, :token
     attr_accessor :optouter, :optinner, :optmain, :mixin
     attr_accessor :nparams, :lhs, :rhs, :nrhs, :rhsni, :nparam, :nrules
-    attr_accessor :prerulelist, :postrulelist, :prerule, :postrule
-    attr_accessor :postlhs, :prerhslist, :postrhslist
-    attr_accessor :prerhs, :postrhs, :postsymbol
-    attr_reader   :d_parser, :target_name, :table, :parsing_method
+    attr_reader   :d_parser, :target_name, :parsing_method, :hooks
 
     def initialize d_parser
       @yydebug = true
@@ -401,21 +388,7 @@ module Depager
 
     # initialize hook
     def init_hook
-      @prerulelist = []
-      @postrulelist = []
-
-      @prerule = []
-      @postrule = []
-
-      @postlhs = []
-
-      @postrhslist = []
-      @prerhslist = []
-
-      @prerhs = []
-      @postrhs = []
-
-      @postsymbol = []
+      @hooks = HOOK_KEYS.inject({}){|r,i| r[i]=[]; r }
     end
 
     def init_grammar
@@ -627,21 +600,7 @@ module Depager
         @parsing_method = Simple
         @basis_name = 'self'
         @paramkey = nil
-        @regs = {
-          "prerulelist" => nil,
-          "postrulelist" => nil,
-
-          "prerule" => nil,
-          "postrule" => nil,
-
-          "postlhs" => nil,
-
-          "postrhslist" => nil,
-          "prerhslist" => nil,
-
-          "prerhs" => nil,
-          "postrhs" => nil,
-        }    
+        @regs = { }
       end
 
       def parse_decl
@@ -655,8 +614,11 @@ module Depager
                      [$1, $3 ? true : false]
                    end
             hook = hs.split(' ')
-            hookname = hook.join('_')
-            hook.each{|i| @regs[i] = [i, "#{@d_parser.target_name}_#{hookname}"]}
+            hookname = hook.join('__')
+            hook.each do |i| i = i.to_sym
+              raise unless GrammarParser.hook_name? i
+              @regs[i] = "#{@d_parser.target_name}_#{hookname}"
+            end
             @optouter.push(parse_hook(hookname, mtsk))
           when /^%param\s*(.*)\s*$/
             @paramkey = $1