racc 1.4.13-java → 1.5.1-java

data/README.ja.rdoc

@@ -76,10 +76,9 @@
 == ライセンス
 
   このパッケージに付属するファイルの著作権は青木峰郎が保持します。
-  ライセンスは GNU Lesser General Public License (LGPL) version 2
-  です。ただしユーザが書いた規則ファイルや、Racc がそこから生成し
-  た Ruby スクリプトはその対象外です。好きなライセンスで配布して
-  ください。
+  ライセンスは Ruby ライセンスです。ただしユーザが書いた規則
+  ファイルや、Racc がそこから生成した Ruby スクリプトはその対象
+  外です。好きなライセンスで配布してください。
 
 
 == バグなど

data/README.rdoc

@@ -16,8 +16,6 @@
 == Requirement
 
   *  Ruby 1.8.x or later.
- (*) make and C compiler.
-
 
 == Installation
 
@@ -36,9 +34,9 @@
 
   You can install Racc into your favorite directory by giving
   options to setup.rb. e.g.
-  
+
     $ ruby setup.rb config --prefix=/usr
-  
+
   For details, try "ruby setup.rb --help".
 
 
@@ -68,10 +66,10 @@
 
 == License
 
-  Racc is distributed under the terms of the GNU Lesser General
-  Public License version 2. Note that you do NOT need to follow
-  LGPL for your own parser (racc outputs). You can provide those
-  files under any licenses you want.
+  Racc is distributed under the same terms of ruby.
+  (see the file COPYING). Note that you do NOT need to follow
+  ruby license for your own parser (racc outputs).
+  You can distribute those files under any licenses you want.
 
 
 == Bug Reports

data/Rakefile

@@ -1,51 +1,36 @@
 # -*- ruby -*-
 
-require 'rubygems'
-require 'hoe'
+require "bundler/gem_tasks"
 
-gem 'rake-compiler', '>= 0.4.1'
-
-Hoe.plugin :debugging, :doofus, :git, :isolate, :gemspec
+require 'rdoc/task'
 
-def java?
-  /java/ === RUBY_PLATFORM
-end
-def jruby?
-  Object.const_defined?(:RUBY_ENGINE) and 'jruby' == RUBY_ENGINE
-end
+RDoc::Task.new(:docs) do |rd|
+  spec = Gem::Specification.load("racc.gemspec")
+  rd.main = "README.en.rdoc"
+  rd.rdoc_files.include(spec.files.find_all { |file_name|
+    file_name =~ /^(bin|lib|ext)/ || file_name !~ /\//
+  })
 
-HOE = Hoe.spec 'racc' do
-  developer 'Aaron Patterson', 'aaron@tenderlovemaking.com'
-  license "MIT"
+  title = "#{spec.name}-#{spec.version} Documentation"
 
-  self.extra_rdoc_files  = Dir['*.rdoc']
-  self.history_file      = 'ChangeLog'
-  self.readme_file       = 'README.rdoc'
+  rd.options << "-t #{title}"
+end
 
-  dependency 'rake-compiler', '>= 0.4.1', :developer
-  dependency 'minitest',      '~> 4.7',   :developer # stick to stdlib's version
+require 'rake/testtask'
 
-  if java?
-    self.spec_extras[:platform]   = 'java'
-  else
-    self.spec_extras[:extensions] = %w[ext/racc/extconf.rb]
+Rake::TestTask.new(:test) do |t|
+  t.test_files = FileList["test/**/test_*.rb"]
+  if RUBY_VERSION >= "2.6"
+    t.ruby_opts = %w[--enable-frozen-string-literal --debug=frozen-string-literal]
   end
-
-  self.clean_globs << "lib/#{self.name}/*.{so,bundle,dll,jar}" # from hoe/compiler
-
 end
+gem 'rake-compiler', '>= 0.4.1'
 
-def add_file_to_gem relative_path
-  target_path = File.join gem_build_path, relative_path
-  target_dir = File.dirname(target_path)
-  mkdir_p target_dir unless File.directory?(target_dir)
-  rm_f target_path
-  safe_ln relative_path, target_path
-  HOE.spec.files += [relative_path]
+def java?
+  /java/ === RUBY_PLATFORM
 end
-
-def gem_build_path
-  File.join 'pkg', HOE.spec.full_name
+def jruby?
+  Object.const_defined?(:RUBY_ENGINE) and 'jruby' == RUBY_ENGINE
 end
 
 file 'lib/racc/parser-text.rb' => ['lib/racc/parser.rb'] do |t|
@@ -62,20 +47,10 @@ end
   }
 end
 
-unless jruby?
-  # MRI
-  require "rake/extensiontask"
-  Rake::ExtensionTask.new "cparse", HOE.spec do |ext|
-    ext.lib_dir = File.join 'lib', 'racc'
-    ext.ext_dir = File.join 'ext', 'racc'
-  end
-
-  task :compile => 'lib/racc/parser-text.rb'
-  #
-else
+if jruby?
   # JRUBY
   require "rake/javaextensiontask"
-  Rake::JavaExtensionTask.new("cparse", HOE.spec) do |ext|
+  Rake::JavaExtensionTask.new("cparse") do |ext|
     jruby_home = RbConfig::CONFIG['prefix']
     ext.lib_dir = File.join 'lib', 'racc'
     ext.ext_dir = File.join 'ext', 'racc'
@@ -88,13 +63,15 @@ else
   end
 
   task :compile => ['lib/racc/parser-text.rb']
-
-  task gem_build_path => [:compile] do
-    add_file_to_gem 'lib/racc/cparse-jruby.jar'
+else
+  # MRI
+  require "rake/extensiontask"
+  Rake::ExtensionTask.new "cparse" do |ext|
+    ext.lib_dir = File.join 'lib', 'racc'
+    ext.ext_dir = File.join 'ext', 'racc', 'cparse'
   end
 
+  task :compile => 'lib/racc/parser-text.rb'
 end
 
 task :test => :compile
-
-Hoe.add_include_dirs('.:lib/racc')

data/bin/racc

@@ -1,14 +1,12 @@
 #!/usr/bin/env ruby
 #
-# $Id$
+#
 #
 # Copyright (c) 1999-2006 Minero Aoki
 #
 # This program is free software.
-# You can distribute/modify this program under the terms of
-# the GNU LGPL, Lesser General Public License version 2.1.
-# For details of LGPL, see the file "COPYING".
-#
+# You can distribute/modify this program under the same terms of ruby.
+# see the file "COPYING".
 
 require 'racc/static'
 require 'optparse'
@@ -53,7 +51,7 @@ def main
     logfilename = path
   }
   parser.on('-e', '--executable [RUBYPATH]', 'Makes executable parser.') {|path|
-    executable = true
+    make_executable = true
     rubypath = (path == 'ruby' ? nil : path)
   }
   parser.on('-E', '--embedded', "Embeds Racc runtime in output.") {
@@ -73,10 +71,6 @@ def main
             'Uses CLASSNAME instead of Racc::Parser.') {|name|
     superclass = name
   }
-  parser.on('--runtime=FEATURE',
-            "Uses FEATURE instead of 'racc/parser'") {|feat|
-    runtime = feature
-  }
   parser.on('-C', '--check-only', 'Checks syntax and quit immediately.') {|fl|
     check_only = fl
   }
@@ -90,24 +84,21 @@ def main
     debug_flags = Racc::DebugFlags.parse_option_string(flags)
   }
   #parser.on('--no-extensions', 'Run Racc without any Ruby extension.') {
-  #  Racc.const_set :Racc_No_Extentions, true
+  #  Racc.const_set :Racc_No_Extensions, true
   #}
   parser.on('--version', 'Prints version and quit.') {
     puts "racc version #{Racc::Version}"
     exit 0
   }
   parser.on('--runtime-version', 'Prints runtime version and quit.') {
-    printf "racc runtime version %s (rev. %s); %s\n",
+    printf "racc runtime version %s; %s\n",
            Racc::Parser::Racc_Runtime_Version,
-           Racc::Parser::Racc_Runtime_Revision,
            if Racc::Parser.racc_runtime_type == 'ruby'
-             sprintf('ruby core version %s (rev. %s)',
-                     Racc::Parser::Racc_Runtime_Core_Version_R,
-                     Racc::Parser::Racc_Runtime_Core_Revision_R)
+             sprintf('ruby core version %s',
+                     Racc::Parser::Racc_Runtime_Core_Version_R)
            else
-             sprintf('c core version %s (rev. %s)',
-                     Racc::Parser::Racc_Runtime_Core_Version_C,
-                     Racc::Parser::Racc_Runtime_Core_Revision_C)
+             sprintf('c core version %s',
+                     Racc::Parser::Racc_Runtime_Core_Version_C)
            end
     exit 0
   }
@@ -189,8 +180,12 @@ def main
       log_useless states.grammar
       log_conflict states
     else
-      report_useless states.grammar
-      report_conflict states
+      has_useless = report_useless states.grammar
+      has_conflicts = report_conflict states
+      if has_useless || has_conflicts
+        preamble = make_logfile ? 'C' : 'Turn on logging with "-v" and c'
+        $stderr.puts %Q{#{preamble}heck ".output" file for details}
+      end
     end
 
     profiler.report
@@ -206,13 +201,29 @@ def make_filename(path, suffix)
   path.sub(/(?:\..*?)?\z/, suffix)
 end
 
+LIST_LIMIT = 10
+def report_list(enum, label)
+  c = enum.count
+  if c > 0
+    $stderr.puts "#{c} #{label}:"
+    enum.first(LIST_LIMIT).each do |item|
+      $stderr.puts "  #{yield item}"
+    end
+    $stderr.puts "  ..." if c > LIST_LIMIT
+  end
+end
+
+# @return [Boolean] if anything was reported
 def report_conflict(states)
   if states.should_report_srconflict?
+    reported = true
     $stderr.puts "#{states.n_srconflicts} shift/reduce conflicts"
   end
   if states.rrconflict_exist?
+    reported = true
     $stderr.puts "#{states.n_rrconflicts} reduce/reduce conflicts"
   end
+  reported
 end
 
 def log_conflict(states)
@@ -227,16 +238,17 @@ def log_conflict(states)
   }
 end
 
+# @return [Boolean] if anything was reported
 def report_useless(grammar)
-  if grammar.useless_nonterminal_exist?
-    $stderr.puts "#{grammar.n_useless_nonterminals} useless nonterminals"
-  end
-  if grammar.useless_rule_exist?
-    $stderr.puts "#{grammar.n_useless_rules} useless rules"
-  end
+  reported = report_list(grammar.each_useless_nonterminal, 'useless nonterminals', &:to_s)
+
+  reported ||= report_list(grammar.each_useless_rule, 'useless rules') { |r| "##{r.ident} (#{r.target})" }
+
   if grammar.start.useless?
     $stderr.puts 'fatal: start symbol does not derive any sentence'
+    reported = true
   end
+  reported
 end
 
 def log_useless(grammar)

data/ext/racc/com/headius/racc/Cparse.java

@@ -1,3 +1,17 @@
+/*
+    Cparse.java -- Racc Runtime Core for JRuby
+    
+    Copyright (c) 2016 Charles Oliver Nutter <headius@headius.com>
+    
+    Ported from and distributed under the same licence as cparse.c
+    
+    cparse.c -- Racc Runtime Core
+  
+    Copyright (c) 1999-2006 Minero Aoki
+  
+    This library is free software.
+    You can distribute/modify this program under the same terms of ruby.
+*/
 package com.headius.racc;
 
 import org.jruby.Ruby;
@@ -7,6 +21,7 @@ import org.jruby.RubyClass;
 import org.jruby.RubyContinuation;
 import org.jruby.RubyFixnum;
 import org.jruby.RubyHash;
+import org.jruby.RubyKernel;
 import org.jruby.RubyModule;
 import org.jruby.RubyNumeric;
 import org.jruby.RubyObject;
@@ -24,13 +39,14 @@ import org.jruby.runtime.CallSite;
 import org.jruby.runtime.Helpers;
 import org.jruby.runtime.MethodIndex;
 import org.jruby.runtime.ObjectAllocator;
+import org.jruby.runtime.Signature;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.Visibility;
 import org.jruby.runtime.builtin.IRubyObject;
 import org.jruby.runtime.load.Library;
 
 public class Cparse implements Library {
-    public static final String RACC_VERSION = "1.4.13"; // TODO: parse from Cparse.c
+    public static final String RACC_VERSION = "1.4.15"; // TODO: parse from Cparse.c
 
     public enum TokenType {
         DEFAULT(-1),
@@ -233,10 +249,6 @@ public class Cparse implements Library {
             shift(context, act, tok, val);
         }
 
-        private int REDUCE(ThreadContext context, int act) {
-            return reduce(context, act);
-        }
-
         public void parse_main(ThreadContext context, IRubyObject tok, IRubyObject val, boolean resume) {
             Ruby runtime = context.runtime;
 
@@ -267,7 +279,7 @@ public class Cparse implements Library {
                         i = assert_integer(tmp);
 
                         D_printf("read_next=%d\n", read_next);
-                        if (read_next && (this.t != vFINAL_TOKEN)) {
+                        if (read_next && (!this.t.equals(vFINAL_TOKEN))) {
                             if (this.lex_is_iterator) {
                                 D_puts("resuming...");
                                 if (this.fin != 0) throw runtime.newArgumentError("token given after EOF");
@@ -354,7 +366,21 @@ public class Cparse implements Library {
                         }
                         else if (act < 0 && act > -(this.reduce_n)) {
                             D_puts("reduce");
-                            REDUCE(context, act);
+                            { // macro REDUCE
+                                switch (reduce(context, act)) {
+                                    case 0: /* normal */
+                                        break;
+                                    case 1: /* yyerror */
+                                        branch = USER_YYERROR;
+                                        continue BRANCH;
+                                    case 2: /* yyaccept */
+                                        D_puts("u accept");
+                                        branch = ACCEPT;
+                                        continue BRANCH;
+                                    default:
+                                        break;
+                                }
+                            }
                         }
                         else if (act == -(this.reduce_n)) {
                             branch = ERROR; continue BRANCH;
@@ -367,6 +393,7 @@ public class Cparse implements Library {
                             throw runtime.newRaiseException(RaccBug, "[Cparse Bug] unknown act value " + act);
                         }
 
+                        // fall through
                     case ERROR_RECOVERED:
 
                         if (this.debug) {
@@ -389,9 +416,10 @@ public class Cparse implements Library {
                             call_onerror.call(context, this.parser, this.parser, this.t, val, this.vstack);
                         }
 
+                        // fall through
                     case USER_YYERROR:
                         if (this.errstatus == 3) {
-                            if (this.t == vFINAL_TOKEN) {
+                            if (this.t.equals(vFINAL_TOKEN)) {
                                 this.retval = runtime.getFalse();
                                 this.fin = CP_FIN_EOT;
                                 return;
@@ -464,7 +492,21 @@ public class Cparse implements Library {
                         }
                         else if (act < 0 && act > -(this.reduce_n)) {
                             D_puts("e reduce");
-                            REDUCE(context, act);
+                            { // macro REDUCE
+                                switch (reduce(context, act)) {
+                                    case 0: /* normal */
+                                        break;
+                                    case 1: /* yyerror */
+                                        branch = USER_YYERROR;
+                                        continue BRANCH;
+                                    case 2: /* yyaccept */
+                                        D_puts("u accept");
+                                        branch = ACCEPT;
+                                        continue BRANCH;
+                                    default:
+                                        break;
+                                }
+                            }
                         }
                         else if (act == this.shift_n) {
                             D_puts("e accept");
@@ -489,17 +531,18 @@ public class Cparse implements Library {
         }
 
         private int reduce(ThreadContext context, int act) {
-            IRubyObject code;
             ruleno = -act * 3;
             IRubyObject tag = context.runtime.newSymbol("racc_jump");
-            RubyContinuation rbContinuation = new RubyContinuation(context.runtime, context.runtime.newSymbol("racc_jump"));
-            try {
-                context.pushCatch(rbContinuation.getContinuation());
-                code = reduce0(context);
-                errstatus = assert_integer(parser.getInstanceVariable(ID_ERRSTATUS));
-            } finally {
-                context.popCatch();
-            }
+            IRubyObject code = RubyKernel.rbCatch19(context, this,
+                    tag,
+                    CallBlock19.newCallClosure(this, getMetaClass(), Signature.NO_ARGUMENTS,
+                            new BlockCallback() {
+                                @Override
+                                public IRubyObject call(ThreadContext context, IRubyObject[] args, Block block) {
+                                    return reduce0(context);
+                                }
+                            }, context));
+            errstatus = assert_integer(parser.getInstanceVariable(ID_ERRSTATUS));
             return assert_integer(code);
         }
 
@@ -527,13 +570,13 @@ public class Cparse implements Library {
                         /* call action */
                         if (len == 0) {
                             tmp = context.nil;
-                            if (mid != sym_noreduce)
+                            if (!mid.equals(sym_noreduce))
                                 tmp_v = runtime.newArray();
                             if (this.debug)
                                 tmp_t = runtime.newArray();
                         }
                         else {
-                            if (mid != sym_noreduce) {
+                            if (!mid.equals(sym_noreduce)) {
                                 tmp_v = GET_TAIL(context, this.vstack, len);
                                 tmp = ((RubyArray)tmp_v).entry(0);
                             }
@@ -547,7 +590,7 @@ public class Cparse implements Library {
                             }
                             CUT_TAIL(context, this.state, len);
                         }
-                        if (mid != sym_noreduce) {
+                        if (!mid.equals(sym_noreduce)) {
                             if (this.use_result_var) {
                                 tmp = Helpers.invoke(context, this.parser, mid.toString(), tmp_v, this.vstack, tmp);
                             }
@@ -590,7 +633,7 @@ public class Cparse implements Library {
                             D_puts("(goto) check[i] == nil");
                             branch = NOTFOUND; continue BRANCH;
                         }
-                        if (tmp != runtime.newFixnum(k1)) {
+                        if (!tmp.equals(runtime.newFixnum(k1))) {
                             D_puts("(goto) check[i] != table[i]");
                             branch = NOTFOUND; continue BRANCH;
                         }
@@ -759,7 +802,7 @@ public class Cparse implements Library {
                     }
                 }, context));
             } catch (LexerUnroll maybeOurs) {
-                if (maybeOurs == lexerUnroll) {
+                if (maybeOurs.equals(lexerUnroll)) {
                     return;
                 }
             }