racc 1.4.8 → 1.4.9

data/Rakefile

@@ -29,12 +29,13 @@ Hoe.spec 'racc' do
 end
 
 file 'lib/racc/parser-text.rb' => ['lib/racc/parser.rb'] do |t|
-  file = 'lib/racc/parser.rb'
-  File.open(t.name, 'wb') { |file|
-    file.write(<<-eorb)
+  source = 'lib/racc/parser.rb'
+
+  open(t.name, 'wb') { |io|
+    io.write(<<-eorb)
 module Racc
   PARSER_TEXT = <<'__end_of_file__'
-  #{File.read(file)}"
+#{File.read(source)}
 __end_of_file__
 end
     eorb

data/ext/racc/cparse.c

@@ -17,7 +17,7 @@
                         Important Constants
 ----------------------------------------------------------------------- */
 
-#define RACC_VERSION "1.4.5"
+#define RACC_VERSION "1.4.9"
 
 #define DEFAULT_TOKEN -1
 #define ERROR_TOKEN    1

data/lib/racc/grammar.rb

@@ -1,5 +1,5 @@
 #
-# $Id: 59cb78bc6d79cb4801cea37e379c9ee58fae03b1 $
+# $Id: 733f7084ff1dca50994cba55c8a05aba8d82eb31 $
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
@@ -503,7 +503,7 @@ module Racc
         set.update tmp
         return set
       end
-      tok = h = nil
+      tok = nil
       set.update_a t.heads
       t.heads.each do |ptr|
         tok = ptr.dereference

data/lib/racc/info.rb

@@ -10,7 +10,7 @@
 #
 
 module Racc
-  VERSION   = '1.4.8'
+  VERSION   = '1.4.9'
   Version = VERSION
   Copyright = 'Copyright (c) 1999-2006 Minero Aoki'
 end

data/lib/racc/logfilegenerator.rb

@@ -1,5 +1,5 @@
 #
-# $Id: e5067781f44dc04098421f5c717f2c1c3563a1ff $
+# $Id: a7e9663605afdda065d305b250a9805e3bd3fa70 $
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
@@ -45,7 +45,6 @@ module Racc
     end
 
     def output_useless(out)
-      used = []
       @grammar.each do |rl|
         if rl.useless?
           out.printf "rule %d (%s) never reduced\n",
@@ -90,8 +89,6 @@ module Racc
     end
 
     def action_out(f, state)
-      r = ''
-      e = ''
       sr = state.srconf && state.srconf.dup
       rr = state.rrconf && state.rrconf.dup
       acts = state.action

data/lib/racc/parser-text.rb

@@ -1,7 +1,7 @@
 module Racc
   PARSER_TEXT = <<'__end_of_file__'
-  #
-# $Id: 3c2cf4b8b66a54ac219c7a6020e94b8668ec7e25 $
+#
+# $Id: ad1fffef443194fdfa1052d2eee6850552f94313 $
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
@@ -33,10 +33,10 @@ module Racc
   class Parser
 
     Racc_Runtime_Version = '1.4.6'
-    Racc_Runtime_Revision = '$Id: 3c2cf4b8b66a54ac219c7a6020e94b8668ec7e25 $'
+    Racc_Runtime_Revision = '$Id: ad1fffef443194fdfa1052d2eee6850552f94313 $'
 
     Racc_Runtime_Core_Version_R = '1.4.6'
-    Racc_Runtime_Core_Revision_R = '$Id: 3c2cf4b8b66a54ac219c7a6020e94b8668ec7e25 $'.split[1]
+    Racc_Runtime_Core_Revision_R = '$Id: ad1fffef443194fdfa1052d2eee6850552f94313 $'.split[1]
     begin
       require 'racc/cparse'
     # Racc_Runtime_Core_Version_C  = (defined in extention)
@@ -107,13 +107,11 @@ module Racc
 
     def _racc_do_parse_rb(arg, in_debug)
       action_table, action_check, action_default, action_pointer,
-      goto_table,   goto_check,   goto_default,   goto_pointer,
-      nt_base,      reduce_table, token_table,    shift_n,
-      reduce_n,     use_result,   * = arg
+      _,            _,            _,              _,
+      _,            _,            token_table,    * = arg
 
       _racc_init_sysvars
       tok = act = i = nil
-      nerr = 0
 
       catch(:racc_end_parse) {
         while true
@@ -156,12 +154,10 @@ module Racc
 
     def _racc_yyparse_rb(recv, mid, arg, c_debug)
       action_table, action_check, action_default, action_pointer,
-      goto_table,   goto_check,   goto_default,   goto_pointer,
-      nt_base,      reduce_table, token_table,    shift_n,
-      reduce_n,     use_result,   * = arg
+      _,            _,            _,              _,
+      _,            _,            token_table,    * = arg
 
       _racc_init_sysvars
-      nerr = 0
 
       catch(:racc_end_parse) {
         until i = action_pointer[@racc_state[-1]]
@@ -210,10 +206,10 @@ module Racc
     ###
 
     def _racc_evalact(act, arg)
-      action_table, action_check, action_default, action_pointer,
-      goto_table,   goto_check,   goto_default,   goto_pointer,
-      nt_base,      reduce_table, token_table,    shift_n,
-      reduce_n,     use_result,   * = arg
+      action_table, action_check, _, action_pointer,
+      _,            _,            _, _,
+      _,            _,            _, shift_n,
+      reduce_n,     * = arg
       nerr = 0   # tmp
 
       if act > 0 and act < shift_n
@@ -305,10 +301,11 @@ module Racc
     end
 
     def _racc_do_reduce(arg, act)
-      action_table, action_check, action_default, action_pointer,
-      goto_table,   goto_check,   goto_default,   goto_pointer,
-      nt_base,      reduce_table, token_table,    shift_n,
-      reduce_n,     use_result,   * = arg
+      _,          _,            _,            _,
+      goto_table, goto_check,   goto_default, goto_pointer,
+      nt_base,    reduce_table, _,            _,
+      _,          use_result,   * = arg
+
       state = @racc_state
       vstack = @racc_vstack
       tstack = @racc_tstack

data/lib/racc/parser.rb

@@ -1,5 +1,5 @@
 #
-# $Id: 3c2cf4b8b66a54ac219c7a6020e94b8668ec7e25 $
+# $Id: ad1fffef443194fdfa1052d2eee6850552f94313 $
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
@@ -31,10 +31,10 @@ module Racc
   class Parser
 
     Racc_Runtime_Version = '1.4.6'
-    Racc_Runtime_Revision = '$Id: 3c2cf4b8b66a54ac219c7a6020e94b8668ec7e25 $'
+    Racc_Runtime_Revision = '$Id: ad1fffef443194fdfa1052d2eee6850552f94313 $'
 
     Racc_Runtime_Core_Version_R = '1.4.6'
-    Racc_Runtime_Core_Revision_R = '$Id: 3c2cf4b8b66a54ac219c7a6020e94b8668ec7e25 $'.split[1]
+    Racc_Runtime_Core_Revision_R = '$Id: ad1fffef443194fdfa1052d2eee6850552f94313 $'.split[1]
     begin
       require 'racc/cparse'
     # Racc_Runtime_Core_Version_C  = (defined in extention)
@@ -105,13 +105,11 @@ module Racc
 
     def _racc_do_parse_rb(arg, in_debug)
       action_table, action_check, action_default, action_pointer,
-      goto_table,   goto_check,   goto_default,   goto_pointer,
-      nt_base,      reduce_table, token_table,    shift_n,
-      reduce_n,     use_result,   * = arg
+      _,            _,            _,              _,
+      _,            _,            token_table,    * = arg
 
       _racc_init_sysvars
       tok = act = i = nil
-      nerr = 0
 
       catch(:racc_end_parse) {
         while true
@@ -154,12 +152,10 @@ module Racc
 
     def _racc_yyparse_rb(recv, mid, arg, c_debug)
       action_table, action_check, action_default, action_pointer,
-      goto_table,   goto_check,   goto_default,   goto_pointer,
-      nt_base,      reduce_table, token_table,    shift_n,
-      reduce_n,     use_result,   * = arg
+      _,            _,            _,              _,
+      _,            _,            token_table,    * = arg
 
       _racc_init_sysvars
-      nerr = 0
 
       catch(:racc_end_parse) {
         until i = action_pointer[@racc_state[-1]]
@@ -208,10 +204,10 @@ module Racc
     ###
 
     def _racc_evalact(act, arg)
-      action_table, action_check, action_default, action_pointer,
-      goto_table,   goto_check,   goto_default,   goto_pointer,
-      nt_base,      reduce_table, token_table,    shift_n,
-      reduce_n,     use_result,   * = arg
+      action_table, action_check, _, action_pointer,
+      _,            _,            _, _,
+      _,            _,            _, shift_n,
+      reduce_n,     * = arg
       nerr = 0   # tmp
 
       if act > 0 and act < shift_n
@@ -303,10 +299,11 @@ module Racc
     end
 
     def _racc_do_reduce(arg, act)
-      action_table, action_check, action_default, action_pointer,
-      goto_table,   goto_check,   goto_default,   goto_pointer,
-      nt_base,      reduce_table, token_table,    shift_n,
-      reduce_n,     use_result,   * = arg
+      _,          _,            _,            _,
+      goto_table, goto_check,   goto_default, goto_pointer,
+      nt_base,    reduce_table, _,            _,
+      _,          use_result,   * = arg
+
       state = @racc_state
       vstack = @racc_vstack
       tstack = @racc_tstack

data/lib/racc/parserfilegenerator.rb

@@ -1,5 +1,5 @@
 #
-# $Id: 3c349a9555848157adc107a876aaa77db47b6459 $
+# $Id: 75aee0ac3cd6429e28eac511d78a717614123a89 $
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
@@ -114,7 +114,7 @@ module Racc
       footer
     end
 
-    c = ::Config::CONFIG
+    c = ::RbConfig::CONFIG
     RUBY_PATH = "#{c['bindir']}/#{c['ruby_install_name']}#{c['EXEEXT']}"
 
     def shebang(path)
@@ -463,7 +463,7 @@ module Racc
     def remove_blank_lines(src)
       body = src.text.dup
       line = src.lineno
-      while m = body.slice!(/\A[ \t\f]*(?:\n|\r\n|\r)/)
+      while body.slice!(/\A[ \t\f]*(?:\n|\r\n|\r)/)
         line += 1
       end
       SourceText.new(body, src.filename, line)

data/lib/racc/statetransitiontable.rb

@@ -1,5 +1,5 @@
 #
-# $Id: ac1616603c3b544fd4a8922377cb566e4b64cfc9 $
+# $Id: 4c5f4311663b6d03050953d64d6a0e7905ff2216 $
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
@@ -302,7 +302,7 @@ module Racc
           c.funcall(:alias_method, "_reduce_#{rule.ident}", :_reduce_none)
         else
           c.funcall(:define_method, "_racc_action_#{rule.ident}", &rule.action.proc)
-          c.module_eval(s = <<-End, __FILE__, __LINE__ + 1)
+          c.module_eval(<<-End, __FILE__, __LINE__ + 1)
             def _reduce_#{rule.ident}(vals, vstack)
               _racc_action_#{rule.ident}(*vals)
             end

data/test/helper.rb

@@ -2,6 +2,7 @@ $VERBOSE = true
 require 'test/unit'
 require 'racc/static'
 require 'fileutils'
+require 'tempfile'
 
 module Racc
   class TestCase < Test::Unit::TestCase
@@ -76,12 +77,14 @@ module Racc
     def racc arg
       ruby "-S #{RACC} #{arg}"
     end
-    
+
     def ruby arg
       Dir.chdir(TEST_DIR) do
-        cmd = "#{ENV['_']} -I #{INC} #{arg} 2>>/tmp/out"
-        result = system(cmd)
-        result ? assert(result) : raise(cmd)
+        Tempfile.open 'test' do |io|
+          cmd = "#{ENV['_']} -I #{INC} #{arg} 2>#{io.path}"
+          result = system(cmd)
+          assert(result, io.read)
+        end
       end
     end
   end

data/test/test_racc_command.rb

@@ -141,13 +141,13 @@ module Racc
     end
 
     def test_norule_y
-      assert_raises(RuntimeError) {
+      assert_raises(MiniTest::Assertion) {
         assert_compile 'norule.y'
       }
     end
 
     def test_unterm_y
-      assert_raises(RuntimeError) {
+      assert_raises(MiniTest::Assertion) {
         assert_compile 'unterm.y'
       }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: racc
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.4.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,41 +9,56 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000 Z
+date: 2012-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: &70145906201240 !ruby/object:Gem::Requirement
+  name: rdoc
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.1
+        version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70145906201240
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &70145906200460 !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.10'
+- !ruby/object:Gem::Dependency
+  name: rake-compiler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.1
   type: :development
   prerelease: false
-  version_requirements: *70145906200460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70145906199740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.13'
+        version: '3.0'
   type: :development
   prerelease: false
-  version_requirements: *70145906199740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: ! "Racc is a LALR(1) parser generator.\n  It is written in Ruby itself,
   and generates Ruby program.\n\n  NOTE: Ruby 1.8.x comes with Racc runtime module.
   \ You\n  can run your parsers generated by racc 1.4.x out of the\n  box."
@@ -59,6 +74,14 @@ extra_rdoc_files:
 - Manifest.txt
 - README.ja.rdoc
 - README.rdoc
+- rdoc/en/NEWS.en.rdoc
+- rdoc/en/debug.en.rdoc
+- rdoc/en/grammar.en.rdoc
+- rdoc/en/parser.en.rdoc
+- rdoc/ja/NEWS.ja.rdoc
+- rdoc/ja/debug.ja.rdoc
+- rdoc/ja/grammar.ja.rdoc
+- rdoc/ja/parser.ja.rdoc
 files:
 - COPYING
 - ChangeLog
@@ -188,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: racc
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Racc is a LALR(1) parser generator