kanayago 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6b8dcde5a49288a284edf3323cc0279740a923e0ea85d895571dcfa1be774970
-  data.tar.gz: 5c7bf5ef11155f14e6b8f2049bd344228c10089cb430b4d4c453a7b02e94bdb5
+  metadata.gz: 5a3eb2ad59c4bf7537be2abff7da6f0b93e79173d8fa6ae51dee86a8966ee83b
+  data.tar.gz: c2c4608ccf7ef25054abd327702f6fbd1713c31769bb78062290d8248bce9b0f
 SHA512:
-  metadata.gz: ce3d04f88db918e619f94195b2ca33cae122466b502a56df3e399acfadc7e4ed193ff045b0d12e326ff2fbeb4435587ce75507a02c7a1185c4f3a0290f7d3935
-  data.tar.gz: 0a3981c9eae87d6fd12ff320a3f3d8759c78830b2936569c604e7c1c82ca614f2ba07c2d1e97b2c765c81ed4eb0b7e63424af75e8342320c8bc0134fb69aa3b5
+  metadata.gz: 16dd25fc0a69b15b85010abd4bb4784d2559cd7a5a0024bd4b60814fa2b376249d222a1c16cd16c049db31cbe855fb12eb5571e3af872e9d83d36a08e9fdd6f8
+  data.tar.gz: 07b9d5a878182eedb53d637dd6f4a02d8b53fdd8b0f7a6786ce045d3269abc52843c9792efcd9f482d1f7ebf4e7fa7e051548b998f48f81703799b975bf85fd1

data/README.md

@@ -31,7 +31,7 @@ Finally, build `Kanayago` gem  and install it.
 
 ```console
 bundle exec rake build
-gem install pkg/kanayago-0.2.0.gem
+gem install pkg/kanayago-0.3.0.gem
 ```
 
 ## Usage

data/Rakefile

@@ -14,52 +14,9 @@ else
 end
 
 namespace :ruby_parser do
-  desc 'import ruby parser files'
-  task :import do
-    tar_name = if RUBY_DESCRIPTION.include?('dev')
-                 'snapshot/snapshot-master.tar.gz'
-               else
-                 "#{RUBY_VERSION[0..2]}/ruby-#{RUBY_VERSION}.tar.gz"
-               end
-
-    `mkdir -p tmp/ruby`
-    `curl -L https://cache.ruby-lang.org/pub/ruby/#{tar_name} -o tmp/ruby.tar.gz`
-    `tar -zxvf tmp/ruby.tar.gz -C tmp/ruby --strip-components 1`
-
-    dist = File.expand_path('ext/kanayago', __dir__)
-    ruby_dir = File.expand_path('tmp/ruby', __dir__)
-
-    MAKE_DIRECTORIES.each do |dir|
-      Dir.mkdir File.join(dist, dir) unless Dir.exist? dir
-    end
-
-    RUBY_PARSER_COPY_TARGETS.each do |target|
-      FileUtils.cp File.join(ruby_dir, target), File.join(dist, target)
-    end
-
-    # "probes.h"
-    probes_h_path = File.join(dist, 'probes.h')
-    File.open(probes_h_path, 'w+') do |f|
-      f << <<~SRC
-        #define RUBY_DTRACE_PARSE_BEGIN_ENABLED() (0)
-        #define RUBY_DTRACE_PARSE_BEGIN(arg0, arg1) (void)(arg0), (void)(arg1);
-        #define RUBY_DTRACE_PARSE_END_ENABLED() (0)
-        #define RUBY_DTRACE_PARSE_END(arg0, arg1) (void)(arg0), (void)(arg1);
-      SRC
-    end
-
-    `rm -rf tmp/ruby tmp/ruby.tar.gz`
-  end
-
-  desc 'patched ro ruby parse that build for Kanayago'
-  task :patch do
-    running_ruby_version = if RUBY_DESCRIPTION.include?('dev')
-                             'head'
-                           else
-                             RUBY_VERSION[..2]
-                           end
-
-    sh "patch -p1 < patch/#{running_ruby_version}/kanayago.patch"
+  desc 'import ruby parser files and apply patch'
+  task :setup do
+    sh 'ruby script/setup_parser.rb'
   end
 
   desc 'clean to ruby parser file'
@@ -82,8 +39,8 @@ namespace :ruby_parser do
   end
 end
 
-task build: ['ruby_parser:import', 'ruby_parser:patch', 'compile']
-task install: ['ruby_parser:import', 'ruby_parser:patch', 'compile']
+task :build # rubocop:disable Rake/Desc
+task install: ['ruby_parser:clean', 'ruby_parser:setup', 'compile']
 
 GEMSPEC = Gem::Specification.load('kanayago.gemspec')
 

data/ext/kanayago/extconf.rb

@@ -2,6 +2,14 @@
 
 require 'mkmf'
 
+# Run setup script to prepare Ruby parser files before building
+setup_script = File.expand_path('../../script/setup_parser.rb', __dir__)
+puts 'Running parser setup script...'
+unless system("ruby #{setup_script}")
+  warn 'Failed to setup parser files. Please check the error messages above.'
+  exit 1
+end
+
 $objs = %w[
   node
   parse

data/lib/kanayago/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Kanayago
-  VERSION = '0.2.0'
+  VERSION = '0.3.0'
 end

data/script/setup_parser.rb

@@ -0,0 +1,136 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'fileutils'
+
+# Ruby parser setup script for Kanayago
+# This script downloads Ruby source code and prepares parser files for building
+module KanayagoSetup
+  class << self
+    def run
+      puts 'Setting up Ruby parser files for Kanayago...'
+
+      # Determine Ruby version
+      ruby_version = detect_ruby_version
+      puts "Detected Ruby version: #{ruby_version}"
+
+      # Load copy targets for this Ruby version
+      load_copy_targets(ruby_version)
+
+      # Import parser files
+      import_parser_files(ruby_version)
+
+      # Apply patch
+      apply_patch(ruby_version)
+
+      puts 'Setup completed successfully!'
+    rescue StandardError => e
+      warn "Error during setup: #{e.message}"
+      warn e.backtrace.join("\n")
+      exit 1
+    end
+
+    private
+
+    def detect_ruby_version
+      if RUBY_DESCRIPTION.include?('dev')
+        'head'
+      else
+        RUBY_VERSION[0..2]
+      end
+    end
+
+    def load_copy_targets(version)
+      copy_target_path = File.expand_path("../patch/#{version}/copy_target.rb", __dir__)
+
+      raise "Copy target file not found: #{copy_target_path}" unless File.exist?(copy_target_path)
+
+      require copy_target_path
+    end
+
+    def import_parser_files(version) # rubocop:disable Metrics/PerceivedComplexity
+      puts 'Importing Ruby parser files...'
+
+      tar_name = if version == 'head'
+                   'snapshot/snapshot-master.tar.gz'
+                 else
+                   "#{version}/ruby-#{RUBY_VERSION}.tar.gz"
+                 end
+
+      # Get project root directory
+      project_root = File.expand_path('..', __dir__)
+      tmp_dir = File.join(project_root, 'tmp')
+      tmp_ruby_dir = File.join(tmp_dir, 'ruby')
+      tmp_tar_file = File.join(tmp_dir, 'ruby.tar.gz')
+
+      # Create temporary directory
+      FileUtils.mkdir_p(tmp_ruby_dir)
+
+      # Download Ruby source
+      puts 'Downloading Ruby source from cache.ruby-lang.org...'
+      system("curl -L https://cache.ruby-lang.org/pub/ruby/#{tar_name} -o #{tmp_tar_file}") ||
+        raise('Failed to download Ruby source')
+
+      # Extract
+      puts 'Extracting Ruby source...'
+      system("tar -zxf #{tmp_tar_file} -C #{tmp_ruby_dir} --strip-components 1") ||
+        raise('Failed to extract Ruby source')
+
+      dist = File.join(project_root, 'ext', 'kanayago')
+
+      # Create necessary directories
+      MAKE_DIRECTORIES.each do |dir|
+        dir_path = File.join(dist, dir)
+        FileUtils.mkdir_p(dir_path)
+      end
+
+      # Copy files
+      puts 'Copying parser files...'
+      RUBY_PARSER_COPY_TARGETS.each do |target|
+        src = File.join(tmp_ruby_dir, target)
+        dst = File.join(dist, target)
+
+        if File.exist?(src)
+          FileUtils.cp(src, dst)
+        else
+          warn "Warning: Source file not found: #{src}"
+        end
+      end
+
+      # Generate probes.h
+      puts 'Generating probes.h...'
+      probes_h_path = File.join(dist, 'probes.h')
+      File.open(probes_h_path, 'w+') do |f|
+        f << <<~SRC
+          #define RUBY_DTRACE_PARSE_BEGIN_ENABLED() (0)
+          #define RUBY_DTRACE_PARSE_BEGIN(arg0, arg1) (void)(arg0), (void)(arg1);
+          #define RUBY_DTRACE_PARSE_END_ENABLED() (0)
+          #define RUBY_DTRACE_PARSE_END(arg0, arg1) (void)(arg0), (void)(arg1);
+        SRC
+      end
+
+      # Cleanup
+      puts 'Cleaning up temporary files...'
+      FileUtils.rm_rf(tmp_ruby_dir)
+      FileUtils.rm_f(tmp_tar_file)
+    end
+
+    def apply_patch(version)
+      puts "Applying patch for Ruby #{version}..."
+
+      patch_file = File.expand_path("../patch/#{version}/kanayago.patch", __dir__)
+
+      raise "Patch file not found: #{patch_file}" unless File.exist?(patch_file)
+
+      # Change to project root directory before applying patch
+      project_root = File.expand_path('..', __dir__)
+      Dir.chdir(project_root) do
+        system("patch -p1 < #{patch_file}") ||
+          raise('Failed to apply patch')
+      end
+    end
+  end
+end
+
+# Run setup if this script is executed directly
+KanayagoSetup.run if __FILE__ == $PROGRAM_NAME

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kanayago
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - S-H-GAMELINKS
@@ -23,84 +23,21 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- ext/kanayago/ccan/check_type/check_type.h
-- ext/kanayago/ccan/container_of/container_of.h
-- ext/kanayago/ccan/list/list.h
-- ext/kanayago/ccan/str/str.h
-- ext/kanayago/constant.h
 - ext/kanayago/extconf.rb
-- ext/kanayago/id.h
-- ext/kanayago/id_table.h
-- ext/kanayago/include/ruby/st.h
-- ext/kanayago/internal.h
-- ext/kanayago/internal/array.h
-- ext/kanayago/internal/basic_operators.h
-- ext/kanayago/internal/bignum.h
-- ext/kanayago/internal/bits.h
-- ext/kanayago/internal/compile.h
-- ext/kanayago/internal/compilers.h
-- ext/kanayago/internal/complex.h
-- ext/kanayago/internal/encoding.h
-- ext/kanayago/internal/error.h
-- ext/kanayago/internal/fixnum.h
-- ext/kanayago/internal/gc.h
-- ext/kanayago/internal/hash.h
-- ext/kanayago/internal/imemo.h
-- ext/kanayago/internal/io.h
-- ext/kanayago/internal/namespace.h
-- ext/kanayago/internal/numeric.h
-- ext/kanayago/internal/parse.h
-- ext/kanayago/internal/rational.h
-- ext/kanayago/internal/re.h
-- ext/kanayago/internal/ruby_parser.h
-- ext/kanayago/internal/sanitizers.h
-- ext/kanayago/internal/serial.h
-- ext/kanayago/internal/set_table.h
-- ext/kanayago/internal/static_assert.h
-- ext/kanayago/internal/string.h
-- ext/kanayago/internal/symbol.h
-- ext/kanayago/internal/thread.h
-- ext/kanayago/internal/variable.h
-- ext/kanayago/internal/vm.h
-- ext/kanayago/internal/warnings.h
 - ext/kanayago/kanayago.c
 - ext/kanayago/kanayago.h
-- ext/kanayago/lex.c
 - ext/kanayago/literal_node.c
 - ext/kanayago/literal_node.h
-- ext/kanayago/method.h
-- ext/kanayago/node.c
-- ext/kanayago/node.h
-- ext/kanayago/node_name.inc
-- ext/kanayago/parse.c
-- ext/kanayago/parse.h
-- ext/kanayago/parser_bits.h
-- ext/kanayago/parser_node.h
-- ext/kanayago/parser_st.c
-- ext/kanayago/parser_st.h
-- ext/kanayago/parser_value.h
 - ext/kanayago/pattern_node.c
 - ext/kanayago/pattern_node.h
-- ext/kanayago/probes.h
-- ext/kanayago/ruby_assert.h
-- ext/kanayago/ruby_atomic.h
-- ext/kanayago/ruby_parser.c
-- ext/kanayago/rubyparser.h
 - ext/kanayago/scope_node.c
 - ext/kanayago/scope_node.h
-- ext/kanayago/shape.h
-- ext/kanayago/st.c
 - ext/kanayago/statement_node.c
 - ext/kanayago/statement_node.h
 - ext/kanayago/string_node.c
 - ext/kanayago/string_node.h
-- ext/kanayago/symbol.h
-- ext/kanayago/thread_pthread.h
-- ext/kanayago/universal_parser.c
 - ext/kanayago/variable_node.c
 - ext/kanayago/variable_node.h
-- ext/kanayago/vm_core.h
-- ext/kanayago/vm_opts.h
 - lib/kanayago.rb
 - lib/kanayago/literal_node.rb
 - lib/kanayago/pattern_node.rb
@@ -114,6 +51,7 @@ files:
 - patch/head/kanayago.patch
 - sample/minitest_generator.rb
 - sample/test_generator.rb
+- script/setup_parser.rb
 - sig/kanayago.rbs
 - typeprof.conf.json
 homepage: https://github.com/S-H-GAMELINKS/kanayago

data/ext/kanayago/ccan/check_type/check_type.h

@@ -1,63 +0,0 @@
-/* CC0 (Public domain) - see ccan/licenses/CC0 file for details */
-#ifndef CCAN_CHECK_TYPE_H
-#define CCAN_CHECK_TYPE_H
-
-/**
- * ccan_check_type - issue a warning or build failure if type is not correct.
- * @expr: the expression whose type we should check (not evaluated).
- * @type: the exact type we expect the expression to be.
- *
- * This macro is usually used within other macros to try to ensure that a macro
- * argument is of the expected type.  No type promotion of the expression is
- * done: an unsigned int is not the same as an int!
- *
- * ccan_check_type() always evaluates to 0.
- *
- * If your compiler does not support typeof, then the best we can do is fail
- * to compile if the sizes of the types are unequal (a less complete check).
- *
- * Example:
- *	// They should always pass a 64-bit value to _set_some_value!
- *	#define set_some_value(expr)			\
- *		_set_some_value((ccan_check_type((expr), uint64_t), (expr)))
- */
-
-/**
- * ccan_check_types_match - issue a warning or build failure if types are not same.
- * @expr1: the first expression (not evaluated).
- * @expr2: the second expression (not evaluated).
- *
- * This macro is usually used within other macros to try to ensure that
- * arguments are of identical types.  No type promotion of the expressions is
- * done: an unsigned int is not the same as an int!
- *
- * ccan_check_types_match() always evaluates to 0.
- *
- * If your compiler does not support typeof, then the best we can do is fail
- * to compile if the sizes of the types are unequal (a less complete check).
- *
- * Example:
- *	// Do subtraction to get to enclosing type, but make sure that
- *	// pointer is of correct type for that member.
- *	#define ccan_container_of(mbr_ptr, encl_type, mbr)			\
- *		(ccan_check_types_match((mbr_ptr), &((encl_type *)0)->mbr),	\
- *		 ((encl_type *)						\
- *		  ((char *)(mbr_ptr) - offsetof(enclosing_type, mbr))))
- */
-#if defined(HAVE_TYPEOF) && HAVE_TYPEOF
-#define ccan_check_type(expr, type)			\
-	((typeof(expr) *)0 != (type *)0)
-
-#define ccan_check_types_match(expr1, expr2)		\
-	((typeof(expr1) *)0 != (typeof(expr2) *)0)
-#else
-#include "ccan/build_assert/build_assert.h"
-/* Without typeof, we can only test the sizes. */
-#define ccan_check_type(expr, type)					\
-	CCAN_BUILD_ASSERT_OR_ZERO(sizeof(expr) == sizeof(type))
-
-#define ccan_check_types_match(expr1, expr2)				\
-	CCAN_BUILD_ASSERT_OR_ZERO(sizeof(expr1) == sizeof(expr2))
-#endif /* HAVE_TYPEOF */
-
-#endif /* CCAN_CHECK_TYPE_H */

data/ext/kanayago/ccan/container_of/container_of.h

@@ -1,142 +0,0 @@
-/* CC0 (Public domain) - see ccan/licenses/CC0 file for details */
-#ifndef CCAN_CONTAINER_OF_H
-#define CCAN_CONTAINER_OF_H
-#include "ccan/check_type/check_type.h"
-
-/**
- * ccan_container_of - get pointer to enclosing structure
- * @member_ptr: pointer to the structure member
- * @containing_type: the type this member is within
- * @member: the name of this member within the structure.
- *
- * Given a pointer to a member of a structure, this macro does pointer
- * subtraction to return the pointer to the enclosing type.
- *
- * Example:
- *	struct foo {
- *		int fielda, fieldb;
- *		// ...
- *	};
- *	struct info {
- *		int some_other_field;
- *		struct foo my_foo;
- *	};
- *
- *	static struct info *foo_to_info(struct foo *foo)
- *	{
- *		return ccan_container_of(foo, struct info, my_foo);
- *	}
- */
-#define ccan_container_of(member_ptr, containing_type, member)		\
-	 ((containing_type *)						\
-	  ((char *)(member_ptr)						\
-	   - ccan_container_off(containing_type, member))		\
-	  + ccan_check_types_match(*(member_ptr), ((containing_type *)0)->member))
-
-
-/**
- * ccan_container_of_or_null - get pointer to enclosing structure, or NULL
- * @member_ptr: pointer to the structure member
- * @containing_type: the type this member is within
- * @member: the name of this member within the structure.
- *
- * Given a pointer to a member of a structure, this macro does pointer
- * subtraction to return the pointer to the enclosing type, unless it
- * is given NULL, in which case it also returns NULL.
- *
- * Example:
- *	struct foo {
- *		int fielda, fieldb;
- *		// ...
- *	};
- *	struct info {
- *		int some_other_field;
- *		struct foo my_foo;
- *	};
- *
- *	static struct info *foo_to_info_allowing_null(struct foo *foo)
- *	{
- *		return ccan_container_of_or_null(foo, struct info, my_foo);
- *	}
- */
-static inline char *container_of_or_null_(void *member_ptr, size_t offset)
-{
-	return member_ptr ? (char *)member_ptr - offset : NULL;
-}
-#define ccan_container_of_or_null(member_ptr, containing_type, member)	\
-	((containing_type *)						\
-	 ccan_container_of_or_null_(member_ptr,				\
-			       ccan_container_off(containing_type, member))	\
-	 + ccan_check_types_match(*(member_ptr), ((containing_type *)0)->member))
-
-/**
- * ccan_container_off - get offset to enclosing structure
- * @containing_type: the type this member is within
- * @member: the name of this member within the structure.
- *
- * Given a pointer to a member of a structure, this macro does
- * typechecking and figures out the offset to the enclosing type.
- *
- * Example:
- *	struct foo {
- *		int fielda, fieldb;
- *		// ...
- *	};
- *	struct info {
- *		int some_other_field;
- *		struct foo my_foo;
- *	};
- *
- *	static struct info *foo_to_info(struct foo *foo)
- *	{
- *		size_t off = ccan_container_off(struct info, my_foo);
- *		return (void *)((char *)foo - off);
- *	}
- */
-#define ccan_container_off(containing_type, member)	\
-	offsetof(containing_type, member)
-
-/**
- * ccan_container_of_var - get pointer to enclosing structure using a variable
- * @member_ptr: pointer to the structure member
- * @container_var: a pointer of same type as this member's container
- * @member: the name of this member within the structure.
- *
- * Given a pointer to a member of a structure, this macro does pointer
- * subtraction to return the pointer to the enclosing type.
- *
- * Example:
- *	static struct info *foo_to_i(struct foo *foo)
- *	{
- *		struct info *i = ccan_container_of_var(foo, i, my_foo);
- *		return i;
- *	}
- */
-#if defined(HAVE_TYPEOF) && HAVE_TYPEOF
-#define ccan_container_of_var(member_ptr, container_var, member) \
-	ccan_container_of(member_ptr, typeof(*container_var), member)
-#else
-#define ccan_container_of_var(member_ptr, container_var, member)	\
-	((void *)((char *)(member_ptr)	-			\
-		  ccan_container_off_var(container_var, member)))
-#endif
-
-/**
- * ccan_container_off_var - get offset of a field in enclosing structure
- * @container_var: a pointer to a container structure
- * @member: the name of a member within the structure.
- *
- * Given (any) pointer to a structure and a its member name, this
- * macro does pointer subtraction to return offset of member in a
- * structure memory layout.
- *
- */
-#if defined(HAVE_TYPEOF) && HAVE_TYPEOF
-#define ccan_container_off_var(var, member)		\
-	ccan_container_off(typeof(*var), member)
-#else
-#define ccan_container_off_var(var, member)			\
-	((const char *)&(var)->member - (const char *)(var))
-#endif
-
-#endif /* CCAN_CONTAINER_OF_H */