depager 0.1.9 → 0.2.0

data/lib/depager/srp.rb

@@ -1,17 +1,18 @@
 class ShiftReducePrinter < Depager::AdvancedParser
   def initialize inside
     super
+    @i2nt, @i2t = @basis.i2nt, @basis.i2t
   end
   def dumpstack stack
     r = ''
-    _stack.each_with_index do |v,x| 
+    _stack.each_with_index do |v,x|
       r += if x % 2 == 0
              "(#{v}) "
            else
              if v[1] == :NT
                "#{@i2nt[v[0]]}:#{v[1..-1].inspect} "
              elsif @i2t[v[0]].class == String
-               "'#{@i2t[v[0]]}' "
+               "'#{@i2t[v[0]]}':#{v[1..-1].inspect}"
              else
                "#{@i2t[v[0]]}:#{v[1..-1].inspect} "
              end

data/lib/depager/template/extension_lalr_slave.erb

@@ -25,7 +25,7 @@
 module D4<%= target_name %> #:nodoc:all
 end
 
-class <%= target_name %> < Basis #:nodoc:all
+class <%= target_name %> < Depager::LALR::Basis #:nodoc:all
   include Depager::ExtensionUtils
   <% mixin.each do |i| %>
   include <%=i%><%end%>

data/lib/depager/template/single_lalr_parser.erb

@@ -27,7 +27,7 @@ require 'depager/parser.rb'
 module D4<%= target_name %>
 end
 
-class <%= target_name %> < Depager::Basis
+class <%= target_name %> < Depager::LALR::Basis
   <% mixin.each do |i| %>
   include <%=i%><%end%>
 

data/lib/depager/utils.rb

@@ -71,8 +71,9 @@ module Depager
     def gen_action_decorator_code bname, dname, on_reduce, optouter='', mixin=[]
       mixin_code = mixin.map{|i| "        include #{i}\n"}
       on_reduce_code = on_reduce.map{|i| "          #{i||'nil'},\n"}
+      ans = @g_parser.parsing_method
       code = %{
-        class D4#{bname}::#{dname} < Depager::Action #:nodoc:all
+        class D4#{bname}::#{dname} < #{ans}::Action #:nodoc:all
           include Depager::DecoratorUtils
           #{mixin_code}
           on_reduce = [

data/lib/depager/version.rb

@@ -1,8 +1,8 @@
 module Depager #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 1
-    TINY  = 9
+    MINOR = 2
+    TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: depager
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
-date: 2007-05-28 00:00:00 +09:00
+  version: 0.2.0
+date: 2007-08-20 00:00:00 +09:00
 summary: A self extensible parser generator.
 require_paths: 
 - lib
@@ -30,27 +30,47 @@ authors:
 - maita
 files: 
 - ChangeLog
-- Manifest.txt
 - README.en
 - README.ja
 - bin/depager
 - data/depager/misc/depager-mode.el
-- data/depager/sample/extension/paction.dr
-- data/depager/sample/extension/pactiontest.dr
-- data/depager/sample/pl0d/pl0ds.dr
-- data/depager/sample/pl0d/pl0test.pl0
-- data/depager/sample/sample_calc/calc.action.dr
-- data/depager/sample/sample_calc/calc.astdf.dr
-- data/depager/sample/sample_calc/calc.astl.action.dr
-- data/depager/sample/sample_calc/calc.astl.dr
-- data/depager/sample/sample_calc/calc.atree.dr
-- data/depager/sample/sample_calc/calc.cst.dr
-- data/depager/sample/sample_calc/calc.dr
-- data/depager/sample/sample_calc/calc.lex.dr
-- data/depager/sample/sample_calc/calc.nvaction.dr
-- data/depager/sample/sample_calc/calc_prec.nvaction.dr
-- data/depager/sample/slex_test/slextest1.dr
-- data/depager/sample/slex_test/slextest2.dr
+- data/depager/pre-setup.rb
+- examples/Rakefile
+- examples/c89/c89.dr
+- examples/c89/c89.tab.rb
+- examples/c89/test.c89
+- examples/extension/paction.dr
+- examples/extension/pactiontest.dr
+- examples/pl0d/pl0ds.dr
+- examples/pl0d/pl0ds.tab.rb
+- examples/pl0d/test.pl0ds
+- examples/sample_calc/calc.action.dr
+- examples/sample_calc/calc.action.tab.rb
+- examples/sample_calc/calc.astdf.dr
+- examples/sample_calc/calc.astdf.tab.rb
+- examples/sample_calc/calc.astl.action.dr
+- examples/sample_calc/calc.astl.action.tab.rb
+- examples/sample_calc/calc.astl.dr
+- examples/sample_calc/calc.astl.tab.rb
+- examples/sample_calc/calc.atree.dr
+- examples/sample_calc/calc.atree.tab.rb
+- examples/sample_calc/calc.cst.dr
+- examples/sample_calc/calc.cst.tab.rb
+- examples/sample_calc/calc.dr
+- examples/sample_calc/calc.lex.dr
+- examples/sample_calc/calc.lex.tab.rb
+- examples/sample_calc/calc.nvaction.dr
+- examples/sample_calc/calc.nvaction.tab.rb
+- examples/sample_calc/calc.tab.rb
+- examples/sample_calc/calc_prec.nvaction.dr
+- examples/sample_calc/calc_prec.nvaction.tab.rb
+- examples/sample_calc/test.calc
+- examples/slex_test/divreg.slex.dr
+- examples/slex_test/divreg.slex.tab.rb
+- examples/slex_test/ljoin.slex.dr
+- examples/slex_test/ljoin.slex.tab.rb
+- examples/slex_test/test.divreg
+- examples/slex_test/test.ljoin
 - lib/depager.rb
 - lib/depager/Rakefile
 - lib/depager/action.rb
@@ -62,13 +82,13 @@ files:
 - 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/nvaction.rb
 - lib/depager/parse_action.rb
 - lib/depager/parser.rb
-- lib/depager/psrtmpl.rb
 - lib/depager/slex.dr
 - lib/depager/slex.rb
 - lib/depager/srp.rb
@@ -83,14 +103,8 @@ files:
 - setup.rb
 test_files: []
 
-rdoc_options: 
-- --quiet
-- --title
-- depager documentation
-- --opname
-- index.html
-- --line-numbers
-- --inline-source
+rdoc_options: []
+
 extra_rdoc_files: []
 
 executables: 

data/Manifest.txt

@@ -1,52 +0,0 @@
-ChangeLog
-Manifest.txt
-README.en
-README.ja
-bin/depager
-data/depager/misc/depager-mode.el
-data/depager/sample/extension/paction.dr
-data/depager/sample/extension/pactiontest.dr
-data/depager/sample/pl0d/pl0ds.dr
-data/depager/sample/pl0d/pl0test.pl0
-data/depager/sample/sample_calc/calc.action.dr
-data/depager/sample/sample_calc/calc.astdf.dr
-data/depager/sample/sample_calc/calc.astl.action.dr
-data/depager/sample/sample_calc/calc.astl.dr
-data/depager/sample/sample_calc/calc.atree.dr
-data/depager/sample/sample_calc/calc.cst.dr
-data/depager/sample/sample_calc/calc.dr
-data/depager/sample/sample_calc/calc.lex.dr
-data/depager/sample/sample_calc/calc.nvaction.dr
-data/depager/sample/sample_calc/calc_prec.nvaction.dr
-data/depager/sample/slex_test/slextest1.dr
-data/depager/sample/slex_test/slextest2.dr
-lib/depager.rb
-lib/depager/Rakefile
-lib/depager/action.rb
-lib/depager/ast_base.dr
-lib/depager/ast_base.rb
-lib/depager/astdf.rb
-lib/depager/astl.rb
-lib/depager/atree.dr
-lib/depager/atree.rb
-lib/depager/cst.dr
-lib/depager/cst.rb
-lib/depager/lex.dr
-lib/depager/lex.rb
-lib/depager/lr.rb
-lib/depager/nvaction.rb
-lib/depager/parse_action.rb
-lib/depager/parser.rb
-lib/depager/psrtmpl.rb
-lib/depager/slex.dr
-lib/depager/slex.rb
-lib/depager/srp.rb
-lib/depager/template/astdf.erbs
-lib/depager/template/astl.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/utils.rb
-lib/depager/version.rb
-setup.rb

data/lib/depager/psrtmpl.rb

@@ -1,33 +0,0 @@
-class ShiftReducePrinter < AdvancedParser
-  def initialize inside
-    super
-  end
-  def beforeAccept
-  end
-  def afterAccept
-  end
-  def beforeError
-  end
-  def afterError
-  end
-  def beforeShift
-  end
-  def afterShift
-    super
-    st = _stack.last
-    sh = @i2t[_stack[_stack.size-2]]
-    la = @i2t[_lookahead]
-    warn "shift:<#{sh}> #{st} lookahead:<#{la}>"
-    warn _stack
-  end
-  def beforeReduce
-  end
-  def afterReduce
-    super
-    st = _stack.last
-    re = @i2nt[_stack[_stack.size-2]]
-    la = @i2t[_lookahead]
-    warn "reduse:<#{re}> #{st} lookahead:<#{la}>"
-    warn _stack
-  end
-end