depager 0.2.2 → 0.2.3

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

@@ -20,7 +20,7 @@ class ShiftReducePrinter < Depager::LALR::AdvancedParser
     end
     r
   end
-  def afterShift
+  def after_shift
     st0 = _stack[_stack.size-3]
     st = _stack.last
     sh = @i2t[_stack[_stack.size-2][0]]
@@ -29,7 +29,7 @@ class ShiftReducePrinter < Depager::LALR::AdvancedParser
     warn "LINE:<#{@basis.line}>"
     warn dumpstack(_stack) + "\n"
   end
-  def afterReduce
+  def after_reduce
     st = _stack.last
     re = @i2nt[_stack[_stack.size-2][0]]
     la = @i2t[_lookahead[0]]
@@ -37,10 +37,10 @@ class ShiftReducePrinter < Depager::LALR::AdvancedParser
     warn "LINE:<#{@basis.line}>"
     warn dumpstack(_stack) + "\n"
   end
-  def afterAccept
+  def after_accept
     warn "acc."
   end
-  def afterError
+  def after_error
     st = _stack.last
     re = @i2nt[_stack[_stack.size-2][0]]
     la = @i2t[_lookahead[0]]

data/lib/depager/{template → ruby/templates}/extension_lalr_master.erb

@@ -34,12 +34,12 @@ class <%= target_name %> #:nodoc:all
 
   def __regext__ p
     super p, <%= paramkey %>, nil
-    <% x = 0; h = {}; regs.each do |i, m|; if m%>
-    <%unless h[m[1]]%>@hook[<%=x%>] = <%=m[1]%>.new(p, @nparam, self)<%h[m[1]]=x%>
-    @h2p['<%=m[1].sub(/#{target_name}_/,'')%>'] = @hook[<%=h[m[1]]%>] <%else
-    %># use @hook[<%=h[m[1]]%>](<%=m[1]%>)<%end%>
-    p.<%=i%>.push [@hook[<%=h[m[1]]%>], :do_parse]
-    <% x+=1; end; end%>
+    <% x = 0; h = {}; regs.each do |i, m| %>
+    <% unless h[m] %>@hook[<%=x%>] = <%= m %>.new(p, @nparam, self)<%h[m]=x%>
+    @h2p['<%= m.sub(/#{target_name}_/,'')%>'] = @hook[<%=h[m]%>] <%else
+    %># use @hook[<%=h[m]%>](<%=m%>)<%end%>
+    p.hooks[:<%=i%>].push [@hook[<%=h[m]%>], :do_parse]
+    <% x+=1; end %>
     regext p
   end
 

data/lib/depager/utils.rb

@@ -129,39 +129,35 @@ module Depager
       unindent(code).sub!('$$!!@ BODY @!!$$', body)
     end
       
-    #
-    # generate code from template
-    # 
-    # tmpl::   template symbol
-    # b::      binding
-    # lineno:: line no
-    # d::      input line no - output line no
-    #
-    def gen_tmpl_code tmpl, b, lineno=nil, d=nil
-      erb = ERB.new(self.class::Template[tmpl])
-      erb.result(b)
-    end
-
-    #
-    # make template from file
-    # 
-    # fname::  template file name
-    #
-    def make_tmpl fname
-      tmpl = File.read(fname).split(/===/)
-      tmpl = tmpl.map{|i| i.match(/^:(\S+)/) and [$1.intern, $'] }
-      Hash[*tmpl.compact.flatten]
-    end
-    module_function :make_tmpl
-
     # unindent
     def unindent s
       s = s.join rescue s.to_s
       ind = s.match(/\n(\s+)/)
       s.gsub(/^#{ind[1]}/m, '')
     end
-  end
 
+    def parse_action
+      val = ''
+      start_lineno = lineno
+      if @line =~ /\A\s*\{(.*)\}\s*(#.*)?\Z/
+          val = "    #{$1}\n"
+      else
+        val.concat @line.sub(/\A\s*\{/, '')
+        ind = @line0.match(/\A([ \t]*)/)[1]
+        until file.eof?
+          getline
+          break if line =~ /\A#{ind}\}\s*(#.*)?\Z/ 
+            val.concat line
+        end
+        if file.eof?
+          error_exit 'syntax error(parse_action).', start_lineno
+        end
+      end
+      @line = $'
+      # warn "--action--\n#{val}"
+      return val
+    end
+  end
 
   #
   # Utilities for Extension
@@ -172,7 +168,6 @@ module Depager
     def g_parser
       @g_parser
     end
-    alias gp g_parser  # for compat
 
     # master parser
     def master
@@ -184,27 +179,11 @@ module Depager
       @g_parser.target_name
     end
 
-    # get current token
-    def token
-      @g_parser.token
-    end
-
     # get current line
     def line
       @g_parser.line
     end
 
-    # fix current line using s
-    # s:: fix string 
-    def fixline s
-      @g_parser.line = s
-    end
-
-    # get next token
-    def gettoken
-      @g_parser.gettoken
-    end
-
     # end of file?
     def eof?
       @g_parser.eof?
@@ -260,13 +239,11 @@ module Depager
 
     protected
     # initialize method
-    def init_parser
-    end
+    def init_parser ; end
 
     # do default action
     # for generated extensions
-    def do_default
-    end
+    def do_default ; end
 
     # do default action?
     # for generated extensions
@@ -281,30 +258,17 @@ module Depager
       init_parser
       @line = @g_parser.oldline
       if do_parse?
-        ret = @dect.yyparse @g_parser.files
-        @g_parser.line = @line
-        @g_parser.gettoken
+        ret = @dect.parse @g_parser.files
+        @g_parser.update_context @line
         ret
       else
         do_default
       end
     end
 
-    Hooks = {
-      "prerulelist" => true,
-      "postrulelist" => true,
-      "prerule" => true,
-      "postrule" => true,
-      "postlhs" => true,
-      "postrhslist" => true,
-      "prerhslist" => true,
-      "prerhs" => true,
-      "postrhs" => true,
-    } #:nodoc:
-
     # register extension (for users)
-    def regext p
-    end
+    def regext p ; end
+    
     # register extension (default)
     def __regext__ p, key=:default, reg_p=true
       @g_parser = @p = p
@@ -313,11 +277,8 @@ module Depager
                 when :default ; @g_parser.getnparam(paramkey)
                 else          ; @g_parser.getnparam(key)
                 end
-      self.methods.sort.each do |m|
-        h = m.to_s.downcase
-        if Hooks[h]
-          p.send(h).push [self, m.intern]
-        end
+      self.methods.sort.each do |m| m = m.to_sym
+        p.hooks[m].push [self, m] if GrammarParser.hook_name? m
       end
       regext p if reg_p
     end

data/lib/depager/version.rb

@@ -1,3 +1,3 @@
 module Depager
-  VERSION = '0.2.2'
+  VERSION = '0.2.3'
 end

metadata

@@ -1,33 +1,26 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.0
-specification_version: 1
 name: depager
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
-date: 2008-05-05 00:00:00 +09:00
-summary: A self extensible parser generator.
-require_paths: 
-- lib
-email: maita@fujiyama.slis.tsukuba.ac.jp
-homepage: http://depager.rubyforge.org
-rubyforge_project: depager
-description: A self extensible parser generator.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.2.3
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
 - maita
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-11-24 00:00:00 +09:00
+default_executable: 
+dependencies: []
+
+description: A self extensible parser generator.
+email: maita@fujiyama.slis.tsukuba.ac.jp
+executables: 
+- depager
+extensions: []
+
+extra_rdoc_files: []
+
 files: 
 - ChangeLog
 - README.en
@@ -35,7 +28,6 @@ files:
 - bin/depager
 - data/depager/misc/depager-mode.el
 - data/depager/pre-setup.rb
-- examples/Rakefile
 - examples/c89/c89.dr
 - examples/c89/c89.tab.rb
 - examples/c89/test.c89
@@ -72,45 +64,56 @@ files:
 - examples/slex_test/test.divreg
 - examples/slex_test/test.ljoin
 - lib/depager.rb
-- lib/depager/Rakefile
-- lib/depager/action.rb
-- lib/depager/ast.dr
-- lib/depager/ast.rb
-- lib/depager/astdf.rb
-- lib/depager/atree.dr
-- lib/depager/atree.rb
-- lib/depager/cst.dr
-- lib/depager/cst.rb
 - lib/depager/grammar.rb
-- lib/depager/lex.dr
-- lib/depager/lex.rb
 - lib/depager/lr.rb
-- lib/depager/lr_put_table.rb
-- lib/depager/nvaction.rb
-- lib/depager/parse_action.rb
 - lib/depager/parser.rb
-- lib/depager/slex.dr
-- lib/depager/slex.rb
-- lib/depager/srp.rb
-- lib/depager/template/ast.erbs
-- lib/depager/template/extension_lalr_master.erb
-- lib/depager/template/extension_lalr_slave.erb
-- lib/depager/template/simple.erb
-- lib/depager/template/single_lalr_parser.erb
+- lib/depager/ruby/plugins/_ast_tmpl.rb
+- lib/depager/ruby/plugins/action.rb
+- lib/depager/ruby/plugins/ast.dr
+- lib/depager/ruby/plugins/ast.rb
+- lib/depager/ruby/plugins/astdf.rb
+- lib/depager/ruby/plugins/atree.dr
+- lib/depager/ruby/plugins/atree.rb
+- lib/depager/ruby/plugins/cst.dr
+- lib/depager/ruby/plugins/cst.rb
+- lib/depager/ruby/plugins/lex.dr
+- lib/depager/ruby/plugins/lex.rb
+- lib/depager/ruby/plugins/nvaction.rb
+- lib/depager/ruby/plugins/slex.dr
+- lib/depager/ruby/plugins/slex.rb
+- lib/depager/ruby/plugins/srp.rb
+- lib/depager/ruby/templates/extension_lalr_master.erb
+- lib/depager/ruby/templates/extension_lalr_slave.erb
+- lib/depager/ruby/templates/simple.erb
+- lib/depager/ruby/templates/single_lalr_parser.erb
 - lib/depager/utils.rb
 - lib/depager/version.rb
 - setup.rb
-test_files: []
-
+has_rdoc: true
+homepage: http://depager.rubyforge.org
+post_install_message: 
 rdoc_options: []
 
-extra_rdoc_files: []
-
-executables: 
-- depager
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
+rubyforge_project: depager
+rubygems_version: 1.0.1
+signing_key: 
+specification_version: 2
+summary: A self extensible parser generator.
+test_files: []
 

data/examples/Rakefile

@@ -1,36 +0,0 @@
-Dir.chdir(File.dirname(__FILE__))
-
-require 'rake/clean'
-
-DIRS = ['pl0d', 'sample_calc', 'slex_test', 'c89'] 
-SRC  = DIRS.map{|d| Dir["#{d}/*.dr"] }.flatten
-OBJ  = SRC.map{|i| i.sub(/\.dr$/, '.tab.rb')}
-CLEAN.include(OBJ)
-
-LIBDIR = "../lib"
-BINDIR = "../bin"
-
-SRC.each do |fn|
-  fn.match(/^([^\/]+)\/([^.]+)(\..+)?\.dr$/)
-  dir      = $1
-  base     = $2
-  dst      = "#{dir}/#{$2}#{$3}.tab.rb"
-  exts     = $3 && $3.split('.')[1 .. -1] 
-  depends  = exts ? exts.map{|i| "#{LIBDIR}/depager/#{i}.rb" } : []
-  depends  = depends.unshift fn
-  test_ext = base.split('_')[0] 
-
-  # puts %!#{dst} =>\n  #{depends.join("\n  ")}!
-  file dst => depends do
-    sh "ruby -I#{LIBDIR} #{BINDIR}/depager -g -o #{dst} #{fn}"
-    # raise unless $! == 0
-    Dir["#{dir}/*.#{test_ext}"].each do |t|
-      sh "ruby -I#{LIBDIR} #{dst} < #{t}"
-    end
-  end
-end
-
-task :default => OBJ
-DIRS.each do |d|
-  task d => OBJ.select{|i| i =~ /^#{d}\// }
-end

data/lib/depager/Rakefile

@@ -1,34 +0,0 @@
-Dir.chdir(File.dirname(__FILE__))
-
-require 'rake/clean'
-
-SRC = FileList["*.dr"]
-SRC.delete('lex.dr')
-SRC.unshift('lex.dr')
-OBJ = SRC.ext('rb')
-CLEAN.include(OBJ)
-# CLOBBER.include('extensions')
-PREFIX="../.."
-LIBDIR = "#{PREFIX}/lib"
-BINDIR = "#{PREFIX}/bin"
-
-task :default => OBJ
-
-SRC.each do |fn|
-  fn = fn.sub(/\.[^.]*$/, '')
-  depends = [
-    "#{fn}.dr",
-    'lex.dr',
-    'nvaction.rb',
-    'Rakefile',
-    'template/extension_lalr_master.erb',
-    'template/extension_lalr_slave.erb',
-  ].uniq
-  file("#{fn}.rb" => depends) do
-    sh "ruby -I#{LIBDIR} #{BINDIR}/depager -g -o #{fn}.rb #{fn}.dr"
-  end
-end
-
-file ".extensions" => OBJ do
-  #sh "touch .extensions"
-end

data/lib/depager/lr_put_table.rb

@@ -1,116 +0,0 @@
-class Depager::LALR::Table
-  def state_info
-    @state_info
-  end
-
-  #puts grammar.closure.values.join("\n")
-  #puts "-----"
-  #puts grammar.memo_closure1.sort_by{|k,v| k}.map{|k,v| "#{k.inspect}:\n#{v.join("\n")}"}
-  #puts 'mk'; mk.each{|k, v| p "#{k}=>#{v}"}
-  #trn = trn.uniq
-  #puts 'trn',trn.map{|a| "<#{a[2].n}>#{a[0]} => <#{a[3].n}>#{a[1]}"}
-
-  def gen_state_info
-    g = grammar
-    @state_info = []
-    @action_table.each_with_index {|s,x|
-      shi, red, acc = "", "", ""
-      s.each_with_index {|t, y|
-        next unless t
-        hd = ("  %-15s" % g.symname(y + g.nonterms.size))
-        if t == 'ACC'
-          acc = "#{hd} accept\n\n"
-        elsif t < 0
-          red << "#{hd} reduce using rule #{-t} (#{g.symname g[-t].lhs})\n"            
-        else
-          shi << "#{hd} shift, and goto to state #{t}\n"
-        end
-      }
-      if t = @defred_table[x]
-        as = @defred_after_shift_table[x] ? " [after shift]" : ""
-        red << ("  %-15s" % '$default') <<
-          "reduce using rule #{-t} (#{g.symname g[-t].lhs}) #{as}\n"
-      end
-
-      @state_info << (@states[x].to_s << "\n\n#{shi}\n#{red}\n#{acc}")
-    }
-  end
-
-  def verbose dp
-    g, output = grammar, []
-
-    if $MP_DEBUG.match(/f/)
-      output << "** FIRST1 **"
-      str = g.first1.map{|k, v|
-        "#{g.symname k} => #{v.map{|i| g.symname i}.join(' ')}"
-      }.join("\n")
-      output << "#{str}\n\n"
-    end
-
-    if $MP_DEBUG.match(/e/)
-      output << "** Empty Reduction **"
-      str = g.f0e.map {|k, v| 
-        "#{g.symname k} =>\n" << v.map{|n, f|
-          "  #{rulelist[n]} ? #{f.map{|i| g.symname i}.join(' ')}"
-        }.join("\n")
-      }.join("\n")
-      output << "#{str}\n\n"
-    end
-
-    if $MP_DEBUG.match(/s/)
-      output << "** SYMBOLS **"
-      str = g.syms.map{|k,_| "#{"%03i" % k} #{ g.symname k}"}.sort.join("\n")
-      output << "#{str}\n\n"
-    end
-
-    if $MP_DEBUG.match(/g/)
-      output << "*** Grammar ***"
-      str = g.rulelist.join("\n")
-      output << "#{str}\n\n"
-    end
-
-    if $MP_DEBUG.match(/c/)
-      output << "*** States ***"
-      output << @state_info.to_s
-    end
-
-    nssize = g.nonterms.size
-    if $MP_DEBUG.match(/t/)
-      output << "*** Action Table ***"
-      ws = (nssize...g.syms.size).map{|i| j = g.symname(i).size; j < 6 ? 6 : j}
-      str = "   |"
-      (nssize...g.syms.size).each_with_index{|i, x|
-        str << ("%0#{ws[x]}s|" % g.symname(i))
-      }; str << " $default|\n"
-      
-      @action_table.each_with_index{|i,x|
-        str << ("%03i|" % x)
-        i.each_with_index{|j, y|
-          str << ("%0#{ws[y]}s|" % j)
-        }
-        str << ("%04s,%04s|\n" % [@defred_table[x], @defred_after_shift_table[x]])
-      }
-      output << "#{str}\n\n"
-
-      output <<  "*** Goto Table ***"
-      ws = (1...nssize).map{|i| j = g.symname(i).size; j < 6 ? 6 : j}
-      str = "   |"
-      (1...nssize).each_with_index{|i, x|
-        str << ("%0#{ws[x]}s|" % g.symname(i))
-      }; str << "\n"
-      
-      @goto_table.each_with_index{|i,x|
-        str << ("%03i|" % x)
-        i.each_with_index{|j, y|
-          str << ("%0#{ws[y]}s|" % j)
-        }
-        str << "\n"
-      }
-      output << "#{str}\n\n"
-    end
-
-    File.open("#{File.basename(dp.files.fname, '.dr')}.output", "w"){|f|
-      f.write output.join("\n") 
-    }
-  end
-end