racc 1.4.15 → 1.4.16

data/Manifest.txt

@@ -10,9 +10,9 @@ bin/racc
 bin/racc2y
 bin/y2racc
 ext/racc/MANIFEST
-ext/racc/cparse.c
-ext/racc/depend
-ext/racc/extconf.rb
+ext/racc/cparse/cparse.c
+ext/racc/cparse/depend
+ext/racc/cparse/extconf.rb
 ext/racc/com/headius/racc/Cparse.java
 fastcache/extconf.rb
 fastcache/fastcache.c
@@ -56,7 +56,6 @@ sample/yyerr.y
 setup.rb
 tasks/doc.rb
 tasks/email.rb
-test/assets/bibtex.y
 test/assets/cadenza.y
 test/assets/cast.y
 test/assets/chk.y
@@ -93,8 +92,6 @@ test/assets/opal.y
 test/assets/opt.y
 test/assets/percent.y
 test/assets/php_serialization.y
-test/assets/rdblockparser.y
-test/assets/rdinlineparser.y
 test/assets/recv.y
 test/assets/riml.y
 test/assets/rrconf.y
@@ -113,7 +110,6 @@ test/assets/yyerr.y
 test/bench.y
 test/helper.rb
 test/infini.y
-test/regress/bibtex
 test/regress/cadenza
 test/regress/cast
 test/regress/csspool
@@ -129,8 +125,6 @@ test/regress/nasl
 test/regress/nokogiri-css
 test/regress/opal
 test/regress/php_serialization
-test/regress/rdblockparser
-test/regress/rdinlineparser
 test/regress/riml
 test/regress/ruby18
 test/regress/ruby22

data/README.ja.rdoc

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

data/README.rdoc

@@ -68,10 +68,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,12 +1,12 @@
 # -*- ruby -*-
 
-require 'rubygems'
-require 'hoe'
+require 'rake/testtask'
 
+Rake::TestTask.new(:test) do |t|
+  t.test_files = FileList["test/**/test_*.rb"]
+end
 gem 'rake-compiler', '>= 0.4.1'
 
-Hoe.plugin :debugging, :doofus, :git, :isolate, :gemspec
-
 def java?
   /java/ === RUBY_PLATFORM
 end
@@ -14,40 +14,6 @@ def jruby?
   Object.const_defined?(:RUBY_ENGINE) and 'jruby' == RUBY_ENGINE
 end
 
-HOE = Hoe.spec 'racc' do
-  developer 'Aaron Patterson', 'aaron@tenderlovemaking.com'
-  license "MIT"
-
-  self.extra_rdoc_files  = Dir['*.rdoc']
-  self.history_file      = 'ChangeLog'
-  self.readme_file       = 'README.rdoc'
-
-  dependency 'rake-compiler', '>= 0.4.1', :developer
-  dependency 'minitest',      '~> 4.7',   :developer # stick to stdlib's version
-
-  if java?
-    self.spec_extras[:platform]   = 'java'
-  else
-    self.spec_extras[:extensions] = %w[ext/racc/extconf.rb]
-  end
-
-  self.clean_globs << "lib/#{self.name}/*.{so,bundle,dll,jar}" # from hoe/compiler
-
-end
-
-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]
-end
-
-def gem_build_path
-  File.join 'pkg', HOE.spec.full_name
-end
-
 file 'lib/racc/parser-text.rb' => ['lib/racc/parser.rb'] do |t|
   source = 'lib/racc/parser.rb'
 
@@ -62,20 +28,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 +44,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

@@ -5,10 +5,8 @@
 # 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'

data/ext/racc/{cparse.c → cparse/cparse.c}

@@ -1,9 +1,9 @@
 /*
 
     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.
 
@@ -13,6 +13,13 @@
 
 #include <ruby.h>
 
+#ifndef FALSE
+#define FALSE 0
+#endif
+#ifndef TRUE
+#define TRUE 1
+#endif
+
 /* -----------------------------------------------------------------------
                         Important Constants
 ----------------------------------------------------------------------- */
@@ -189,7 +196,7 @@ static VALUE racc_yyparse _((VALUE parser, VALUE lexer, VALUE lexmid,
                              VALUE arg, VALUE sysdebug));
 
 static void call_lexer _((struct cparse_params *v));
-static VALUE lexer_i _((VALUE block_args, VALUE data, VALUE self));
+static VALUE lexer_i _((RB_BLOCK_CALL_FUNC_ARGLIST(block_args, data)));
 
 static VALUE assert_array _((VALUE a));
 static long assert_integer _((VALUE n));
@@ -197,6 +204,7 @@ static VALUE assert_hash _((VALUE h));
 static VALUE initialize_params _((VALUE vparams, VALUE parser, VALUE arg,
                                  VALUE lexer, VALUE lexmid));
 static void cparse_params_mark _((void *ptr));
+static size_t cparse_params_memsize _((const void *ptr));
 
 static void parse_main _((struct cparse_params *v,
                          VALUE tok, VALUE val, int resume));
@@ -204,7 +212,7 @@ static void extract_user_token _((struct cparse_params *v,
                                   VALUE block_args, VALUE *tok, VALUE *val));
 static void shift _((struct cparse_params* v, long act, VALUE tok, VALUE val));
 static int reduce _((struct cparse_params* v, long act));
-static VALUE reduce0 _((VALUE block_args, VALUE data, VALUE self));
+static rb_block_call_func reduce0;
 
 #ifdef DEBUG
 # define D_puts(msg)        if (v->sys_debug) puts(msg)
@@ -214,35 +222,52 @@ static VALUE reduce0 _((VALUE block_args, VALUE data, VALUE self));
 # define D_printf(fmt,arg)
 #endif
 
+#undef RUBY_UNTYPED_DATA_WARNING
+#define RUBY_UNTYPED_DATA_WARNING 1
+
+static const rb_data_type_t cparse_params_type = {
+    "racc/cparse",
+    {
+	cparse_params_mark,
+	RUBY_TYPED_DEFAULT_FREE,
+	cparse_params_memsize,
+    },
+#ifdef RUBY_TYPED_FREE_IMMEDIATELY
+    0, 0,
+    RUBY_TYPED_FREE_IMMEDIATELY,
+#endif
+};
+
 static VALUE
 racc_cparse(VALUE parser, VALUE arg, VALUE sysdebug)
 {
-    volatile VALUE vparams;
+    VALUE vparams;
     struct cparse_params *v;
 
-    vparams = Data_Make_Struct(CparseParams, struct cparse_params,
-                               cparse_params_mark, -1, v);
+    vparams = TypedData_Make_Struct(CparseParams, struct cparse_params,
+				    &cparse_params_type, v);
     D_puts("starting cparse");
     v->sys_debug = RTEST(sysdebug);
     vparams = initialize_params(vparams, parser, arg, Qnil, Qnil);
-    v->lex_is_iterator = Qfalse;
+    v->lex_is_iterator = FALSE;
     parse_main(v, Qnil, Qnil, 0);
 
+    RB_GC_GUARD(vparams);
     return v->retval;
 }
 
 static VALUE
 racc_yyparse(VALUE parser, VALUE lexer, VALUE lexmid, VALUE arg, VALUE sysdebug)
 {
-    volatile VALUE vparams;
+    VALUE vparams;
     struct cparse_params *v;
 
-    vparams = Data_Make_Struct(CparseParams, struct cparse_params,
-                               cparse_params_mark, -1, v);
+    vparams = TypedData_Make_Struct(CparseParams, struct cparse_params,
+				    &cparse_params_type, v);
     v->sys_debug = RTEST(sysdebug);
     D_puts("start C yyparse");
     vparams = initialize_params(vparams, parser, arg, lexer, lexmid);
-    v->lex_is_iterator = Qtrue;
+    v->lex_is_iterator = TRUE;
     D_puts("params initialized");
     parse_main(v, Qnil, Qnil, 0);
     call_lexer(v);
@@ -251,6 +276,7 @@ racc_yyparse(VALUE parser, VALUE lexer, VALUE lexmid, VALUE arg, VALUE sysdebug)
                  rb_id2name(v->lexmid));
     }
 
+    RB_GC_GUARD(vparams);
     return v->retval;
 }
 
@@ -264,9 +290,8 @@ call_lexer(struct cparse_params *v)
 static VALUE
 lexer_iter(VALUE data)
 {
-    struct cparse_params *v;
+    struct cparse_params *v = rb_check_typeddata(data, &cparse_params_type);
 
-    Data_Get_Struct(data, struct cparse_params, v);
     rb_funcall(v->lexer, v->lexmid, 0);
     return Qnil;
 }
@@ -279,18 +304,17 @@ call_lexer(struct cparse_params *v)
 #endif
 
 static VALUE
-lexer_i(VALUE block_args, VALUE data, VALUE self)
+lexer_i(RB_BLOCK_CALL_FUNC_ARGLIST(block_args, data))
 {
-    struct cparse_params *v;
+    struct cparse_params *v = rb_check_typeddata(data, &cparse_params_type);
     VALUE tok, val;
 
-    Data_Get_Struct(data, struct cparse_params, v);
     if (v->fin)
         rb_raise(rb_eArgError, "extra token after EndOfToken");
     extract_user_token(v, block_args, &tok, &val);
     parse_main(v, tok, val, 1);
     if (v->fin && v->fin != CP_FIN_ACCEPT)
-       rb_iter_break(); 
+       rb_iter_break();
     return Qnil;
 }
 
@@ -317,9 +341,8 @@ assert_integer(VALUE n)
 static VALUE
 initialize_params(VALUE vparams, VALUE parser, VALUE arg, VALUE lexer, VALUE lexmid)
 {
-    struct cparse_params *v;
+    struct cparse_params *v = rb_check_typeddata(vparams, &cparse_params_type);
 
-    Data_Get_Struct(vparams, struct cparse_params, v);
     v->value_v = vparams;
     v->parser = parser;
     v->lexer = lexer;
@@ -348,7 +371,7 @@ initialize_params(VALUE vparams, VALUE parser, VALUE arg, VALUE lexer, VALUE lex
         v->use_result_var = RTEST(rb_ary_entry(arg, 13));
     }
     else {
-        v->use_result_var = Qtrue;
+        v->use_result_var = TRUE;
     }
 
     v->tstack = v->debug ? NEW_STACK() : Qnil;
@@ -364,7 +387,7 @@ initialize_params(VALUE vparams, VALUE parser, VALUE arg, VALUE lexer, VALUE lex
     v->retval = Qnil;
     v->fin = 0;
 
-    v->lex_is_iterator = Qfalse;
+    v->lex_is_iterator = FALSE;
 
     rb_iv_set(parser, "@vstack", v->vstack);
     if (v->debug) {
@@ -402,6 +425,12 @@ cparse_params_mark(void *ptr)
     rb_gc_mark(v->retval);
 }
 
+static size_t
+cparse_params_memsize(const void *ptr)
+{
+    return sizeof(struct cparse_params);
+}
+
 static void
 extract_user_token(struct cparse_params *v, VALUE block_args,
                    VALUE *tok, VALUE *val)
@@ -413,12 +442,12 @@ extract_user_token(struct cparse_params *v, VALUE block_args,
         return;
     }
 
-    if (TYPE(block_args) != T_ARRAY) {
+    if (!RB_TYPE_P(block_args, T_ARRAY)) {
         rb_raise(rb_eTypeError,
-                 "%s() %s %s (must be Array[2])",
+                 "%s() %s %"PRIsVALUE" (must be Array[2])",
                  v->lex_is_iterator ? rb_id2name(v->lexmid) : "next_token",
                  v->lex_is_iterator ? "yielded" : "returned",
-                 rb_class2name(CLASS_OF(block_args)));
+                 rb_obj_class(block_args));
     }
     if (RARRAY_LEN(block_args) != 2) {
         rb_raise(rb_eArgError,
@@ -457,7 +486,7 @@ parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)
 
     if (resume)
         goto resume;
-    
+
     while (1) {
         D_puts("");
         D_puts("---- enter new loop ----");
@@ -516,7 +545,7 @@ parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)
       act_fixed:
         D_printf("act=%ld\n", act);
         goto handle_act;
-    
+
       notfound:
         D_puts("(act) not found: use default");
         act_value = AREF(v->action_default, v->curstate);
@@ -617,7 +646,7 @@ parse_main(struct cparse_params *v, VALUE tok, VALUE val, int resume)
 
         D_puts("(err) found: can handle error token");
         break;
-          
+
       error_pop:
         D_puts("(err) act not found: can't handle error token; pop");
 
@@ -679,9 +708,9 @@ reduce(struct cparse_params *v, long act)
 }
 
 static VALUE
-reduce0(VALUE val, VALUE data, VALUE self)
+reduce0(RB_BLOCK_CALL_FUNC_ARGLIST(_, data))
 {
-    struct cparse_params *v;
+    struct cparse_params *v = rb_check_typeddata(data, &cparse_params_type);
     VALUE reduce_to, reduce_len, method_id;
     long len;
     ID mid;
@@ -689,7 +718,6 @@ reduce0(VALUE val, VALUE data, VALUE self)
     long i, k1, k2;
     VALUE goto_state;
 
-    Data_Get_Struct(data, struct cparse_params, v);
     reduce_len = rb_ary_entry(v->reduce_table, v->ruleno);
     reduce_to  = rb_ary_entry(v->reduce_table, v->ruleno+1);
     method_id  = rb_ary_entry(v->reduce_table, v->ruleno+2);
@@ -791,6 +819,8 @@ reduce0(VALUE val, VALUE data, VALUE self)
 void
 Init_cparse(void)
 {
+#undef rb_intern
+#define rb_intern(str) rb_intern_const(str)
     VALUE Racc, Parser;
     ID id_racc = rb_intern("Racc");
 
@@ -810,6 +840,9 @@ Init_cparse(void)
         rb_str_new2("$originalId: cparse.c,v 1.8 2006/07/06 11:39:46 aamine Exp $"));
 
     CparseParams = rb_define_class_under(Racc, "CparseParams", rb_cObject);
+    rb_undef_alloc_func(CparseParams);
+    rb_undef_method(CparseParams, "initialize");
+    rb_undef_method(CparseParams, "initialize_copy");
 
     RaccBug = rb_eRuntimeError;