kanayago 0.1.1 → 0.3.0

data/lib/kanayago/string_node.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module Kanayago
+  class DynamicStringNode
+    attr_reader :string, :next_nodes
+  end
+
+  class DynamicSymbolNode
+    attr_reader :string, :next_nodes
+  end
+
+  class EmbeddedExpressionStringNode
+    attr_reader :body
+  end
+
+  class ExecuteStringNode
+    attr_reader :ptr, :len, :enc, :coderange
+  end
+
+  class DynamicExecuteStringNode
+    attr_reader :string, :next_nodes
+  end
+
+  class RegexpNode
+    attr_reader :ptr, :len, :enc, :coderange, :options
+  end
+
+  class DynamicRegexpNode
+    attr_reader :string, :next_nodes, :options
+  end
+
+  class MatchNode
+    attr_reader :ptr, :len, :enc, :coderange, :options
+  end
+
+  class Match2Node
+    attr_reader :recv, :value, :args
+  end
+
+  class Match3Node
+    attr_reader :recv, :value
+  end
+end

data/lib/kanayago/variable_node.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module Kanayago
+  class LocalVariableNode
+    attr_reader :vid
+  end
+
+  class DynamicVariableNode
+    attr_reader :vid
+  end
+
+  class InstanceVariableNode
+    attr_reader :vid
+  end
+
+  class ClassVariableNode
+    attr_reader :vid
+  end
+
+  class GlobalVariableNode
+    attr_reader :vid
+  end
+end

data/lib/kanayago/version.rb

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

data/lib/kanayago.rb

@@ -3,9 +3,31 @@
 require_relative 'kanayago/version'
 require_relative 'kanayago/kanayago'
 
+require_relative 'kanayago/literal_node'
+require_relative 'kanayago/string_node'
+require_relative 'kanayago/statement_node'
+require_relative 'kanayago/variable_node'
+require_relative 'kanayago/pattern_node'
+
 # Parse Ruby code with Ruby's Parser(Universal Parser)
 module Kanayago
   def self.parse(source)
     kanayago_parse(source)
   end
+
+  class SelfNode
+    attr_reader :state
+  end
+
+  class ModuleNode
+    attr_reader :cpath, :body
+  end
+
+  class VariableCallNode
+    attr_reader :mid
+  end
+
+  class Colon3Node
+    attr_reader :mid
+  end
 end

data/patch/3.4/copy_target.rb

@@ -0,0 +1,78 @@
+# frozen_string_literal: true
+
+RUBY_PARSER_COPY_TARGETS = %w[
+  ccan/check_type/check_type.h
+  ccan/container_of/container_of.h
+  ccan/list/list.h
+  ccan/str/str.h
+  constant.h
+  id.h
+  id_table.h
+  internal/array.h
+  internal/basic_operators.h
+  internal/bignum.h
+  internal/bits.h
+  internal/compile.h
+  internal/compilers.h
+  internal/complex.h
+  internal/encoding.h
+  internal/error.h
+  internal/fixnum.h
+  internal/gc.h
+  internal/hash.h
+  internal/imemo.h
+  internal/io.h
+  internal/numeric.h
+  internal/parse.h
+  internal/rational.h
+  internal/re.h
+  internal/ruby_parser.h
+  internal/sanitizers.h
+  internal/serial.h
+  internal/static_assert.h
+  internal/string.h
+  internal/symbol.h
+  internal/thread.h
+  internal/variable.h
+  internal/warnings.h
+  internal/vm.h
+  internal.h
+  lex.c
+  method.h
+  node.c
+  node.h
+  node_name.inc
+  parse.c
+  parse.h
+  parser_bits.h
+  parser_node.h
+  parser_st.c
+  parser_st.h
+  parser_value.h
+  ruby_assert.h
+  ruby_atomic.h
+  ruby_parser.c
+  rubyparser.h
+  shape.h
+  st.c
+  symbol.h
+  thread_pthread.h
+  universal_parser.c
+  vm_core.h
+  vm_opts.h
+].freeze
+
+MAKE_DIRECTORIES = [
+  'ccan',
+  'ccan/check_type',
+  'ccan/container',
+  'ccan/container_of',
+  'ccan/list',
+  'ccan/str',
+  'internal'
+].freeze
+
+DELETE_DIRECTORIES = %w[
+  ccan
+  internal
+].freeze

data/patch/3.4/kanayago.patch

@@ -0,0 +1,162 @@
+diff --git a/ext/kanayago/internal/ruby_parser.h b/ext/kanayago/internal/ruby_parser.h
+index 8e306d1..d420a02 100644
+--- a/ext/kanayago/internal/ruby_parser.h
++++ b/ext/kanayago/internal/ruby_parser.h
+@@ -15,6 +15,29 @@ struct lex_pointer_string {
+     long ptr;
+ };
+ 
++// Add Ruby's Parser struct and enum for Kanayago
++enum lex_type {
++    lex_type_str,
++    lex_type_io,
++    lex_type_array,
++    lex_type_generic,
++};
++
++struct ruby_parser {
++    rb_parser_t *parser_params;
++    enum lex_type type;
++    union {
++        struct lex_pointer_string lex_str;
++        struct {
++            VALUE file;
++        } lex_io;
++        struct {
++            VALUE ary;
++        } lex_array;
++    } data;
++};
++// End for Kanayago
++
+ RUBY_SYMBOL_EXPORT_BEGIN
+ #ifdef UNIVERSAL_PARSER
+ const rb_parser_config_t *rb_ruby_parser_config(void);
+diff --git a/ext/kanayago/ruby_parser.c b/ext/kanayago/ruby_parser.c
+index 267f619..841db65 100644
+--- a/ext/kanayago/ruby_parser.c
++++ b/ext/kanayago/ruby_parser.c
+@@ -314,6 +314,44 @@ enc_mbc_to_codepoint(const char *p, const char *e, parser_encoding *enc)
+ 
+ extern VALUE rb_eArgError;
+ 
++//　Add for Kanayago
++static void *
++xmalloc_mul_add(size_t x, size_t y, size_t z)
++{
++    return rb_xmalloc_mul_add(x, y, z);
++}
++
++static VALUE
++suppress_tracing(VALUE (*func)(VALUE), VALUE arg)
++{
++    return func(arg);
++}
++
++static ID
++make_temporary_id(size_t n)
++{
++    return rb_make_temporary_id(n);
++}
++
++static int
++stderr_tty_p(void)
++{
++    return rb_stderr_tty_p();
++}
++
++static VALUE
++reg_compile(VALUE str, int options, const char *sourcefile, int sourceline)
++{
++     return rb_reg_compile(str, options, sourcefile, sourceline);
++}
++
++static VALUE
++reg_check_preprocess(VALUE val)
++{
++    return rb_reg_check_preprocess(val);
++}
++// End of Add for Kanayago
++
+ static const rb_parser_config_t rb_global_parser_config = {
+     .malloc = ruby_xmalloc,
+     .calloc = ruby_xcalloc,
+@@ -325,9 +363,9 @@ static const rb_parser_config_t rb_global_parser_config = {
+     .zalloc = zalloc,
+     .rb_memmove = memmove2,
+     .nonempty_memcpy = nonempty_memcpy,
+-    .xmalloc_mul_add = rb_xmalloc_mul_add,
++    .xmalloc_mul_add = xmalloc_mul_add, // use xmalloc_mul_add for Kanayago
+ 
+-    .compile_callback = rb_suppress_tracing,
++    .compile_callback = suppress_tracing, // use suppress_tracing for Kanayago
+     .reg_named_capture_assign = reg_named_capture_assign,
+ 
+     .attr_get = rb_attr_get,
+@@ -335,7 +373,7 @@ static const rb_parser_config_t rb_global_parser_config = {
+     .ary_new_from_args = rb_ary_new_from_args,
+     .ary_unshift = rb_ary_unshift,
+ 
+-    .make_temporary_id = rb_make_temporary_id,
++    .make_temporary_id = make_temporary_id, // use make_temporary_id for Kanayago
+     .is_local_id = is_local_id2,
+     .is_attrset_id = is_attrset_id2,
+     .is_global_name_punct = is_global_name_punct,
+@@ -365,7 +403,7 @@ static const rb_parser_config_t rb_global_parser_config = {
+ 
+     .int2num = rb_int2num_inline,
+ 
+-    .stderr_tty_p = rb_stderr_tty_p,
++    .stderr_tty_p = stderr_tty_p, //use stderr_tty_p for Kanayago
+     .write_error_str = rb_write_error_str,
+     .io_write = rb_io_write,
+     .io_flush = rb_io_flush,
+@@ -412,8 +450,8 @@ static const rb_parser_config_t rb_global_parser_config = {
+     .gc_guard = gc_guard,
+     .gc_mark = rb_gc_mark,
+ 
+-    .reg_compile = rb_reg_compile,
+-    .reg_check_preprocess = rb_reg_check_preprocess,
++    .reg_compile = reg_compile, // use reg_compile for Kanayago
++    .reg_check_preprocess = reg_check_preprocess, // use reg_check_preprocess for Kanayago
+     .memcicmp = rb_memcicmp,
+ 
+     .compile_warn = rb_compile_warn,
+@@ -443,27 +481,6 @@ static const rb_parser_config_t rb_global_parser_config = {
+ };
+ #endif
+ 
+-enum lex_type {
+-    lex_type_str,
+-    lex_type_io,
+-    lex_type_array,
+-    lex_type_generic,
+-};
+-
+-struct ruby_parser {
+-    rb_parser_t *parser_params;
+-    enum lex_type type;
+-    union {
+-        struct lex_pointer_string lex_str;
+-        struct {
+-            VALUE file;
+-        } lex_io;
+-        struct {
+-            VALUE ary;
+-        } lex_array;
+-    } data;
+-};
+-
+ static void
+ parser_mark(void *ptr)
+ {
+@@ -501,7 +518,8 @@ parser_memsize(const void *ptr)
+     return rb_ruby_parser_memsize(parser->parser_params);
+ }
+ 
+-static const rb_data_type_t ruby_parser_data_type = {
++// Not static const for Kanayago
++const rb_data_type_t ruby_parser_data_type = {
+     "parser",
+     {
+         parser_mark,

data/patch/head/copy_target.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+RUBY_PARSER_COPY_TARGETS = %w[
+  ccan/check_type/check_type.h
+  ccan/container_of/container_of.h
+  ccan/list/list.h
+  ccan/str/str.h
+  constant.h
+  id.h
+  id_table.h
+  include/ruby/st.h
+  internal/array.h
+  internal/basic_operators.h
+  internal/bignum.h
+  internal/bits.h
+  internal/compile.h
+  internal/compilers.h
+  internal/complex.h
+  internal/encoding.h
+  internal/error.h
+  internal/fixnum.h
+  internal/gc.h
+  internal/hash.h
+  internal/imemo.h
+  internal/io.h
+  internal/namespace.h
+  internal/numeric.h
+  internal/parse.h
+  internal/rational.h
+  internal/re.h
+  internal/ruby_parser.h
+  internal/sanitizers.h
+  internal/serial.h
+  internal/set_table.h
+  internal/static_assert.h
+  internal/string.h
+  internal/symbol.h
+  internal/thread.h
+  internal/variable.h
+  internal/warnings.h
+  internal/vm.h
+  internal.h
+  lex.c
+  method.h
+  node.c
+  node.h
+  node_name.inc
+  parse.c
+  parse.h
+  parser_bits.h
+  parser_node.h
+  parser_st.c
+  parser_st.h
+  parser_value.h
+  ruby_assert.h
+  ruby_atomic.h
+  ruby_parser.c
+  rubyparser.h
+  shape.h
+  st.c
+  symbol.h
+  thread_pthread.h
+  universal_parser.c
+  vm_core.h
+  vm_opts.h
+].freeze
+
+MAKE_DIRECTORIES = [
+  'ccan',
+  'ccan/check_type',
+  'ccan/container',
+  'ccan/container_of',
+  'ccan/list',
+  'ccan/str',
+  'internal',
+  'include',
+  'include/ruby'
+].freeze
+
+DELETE_DIRECTORIES = %w[
+  ccan
+  internal
+  include
+].freeze

data/patch/head/kanayago.patch

@@ -0,0 +1,162 @@
+diff --git a/ext/kanayago/internal/ruby_parser.h b/ext/kanayago/internal/ruby_parser.h
+index 8e306d1..d420a02 100644
+--- a/ext/kanayago/internal/ruby_parser.h
++++ b/ext/kanayago/internal/ruby_parser.h
+@@ -15,6 +15,29 @@ struct lex_pointer_string {
+     long ptr;
+ };
+ 
++// Add Ruby's Parser struct and enum for Kanayago
++enum lex_type {
++    lex_type_str,
++    lex_type_io,
++    lex_type_array,
++    lex_type_generic,
++};
++
++struct ruby_parser {
++    rb_parser_t *parser_params;
++    enum lex_type type;
++    union {
++        struct lex_pointer_string lex_str;
++        struct {
++            VALUE file;
++        } lex_io;
++        struct {
++            VALUE ary;
++        } lex_array;
++    } data;
++};
++// End for Kanayago
++
+ RUBY_SYMBOL_EXPORT_BEGIN
+ #ifdef UNIVERSAL_PARSER
+ const rb_parser_config_t *rb_ruby_parser_config(void);
+diff --git a/ext/kanayago/ruby_parser.c b/ext/kanayago/ruby_parser.c
+index 267f619..841db65 100644
+--- a/ext/kanayago/ruby_parser.c
++++ b/ext/kanayago/ruby_parser.c
+@@ -314,6 +314,44 @@ enc_mbc_to_codepoint(const char *p, const char *e, parser_encoding *enc)
+ 
+ extern VALUE rb_eArgError;
+ 
++//　Add for Kanayago
++static void *
++xmalloc_mul_add(size_t x, size_t y, size_t z)
++{
++    return rb_xmalloc_mul_add(x, y, z);
++}
++
++static VALUE
++suppress_tracing(VALUE (*func)(VALUE), VALUE arg)
++{
++    return func(arg);
++}
++
++static ID
++make_temporary_id(size_t n)
++{
++    return rb_make_temporary_id(n);
++}
++
++static int
++stderr_tty_p(void)
++{
++    return rb_stderr_tty_p();
++}
++
++static VALUE
++reg_compile(VALUE str, int options, const char *sourcefile, int sourceline)
++{
++     return rb_reg_compile(str, options, sourcefile, sourceline);
++}
++
++static VALUE
++reg_check_preprocess(VALUE val)
++{
++    return rb_reg_check_preprocess(val);
++}
++// End of Add for Kanayago
++
+ static const rb_parser_config_t rb_global_parser_config = {
+     .malloc = ruby_xmalloc,
+     .calloc = ruby_xcalloc,
+@@ -325,9 +363,9 @@ static const rb_parser_config_t rb_global_parser_config = {
+     .zalloc = zalloc,
+     .rb_memmove = memmove2,
+     .nonempty_memcpy = nonempty_memcpy,
+-    .xmalloc_mul_add = rb_xmalloc_mul_add,
++    .xmalloc_mul_add = xmalloc_mul_add, // use xmalloc_mul_add for Kanayago
+ 
+-    .compile_callback = rb_suppress_tracing,
++    .compile_callback = suppress_tracing, // use suppress_tracing for Kanayago
+     .reg_named_capture_assign = reg_named_capture_assign,
+ 
+     .attr_get = rb_attr_get,
+@@ -335,7 +373,7 @@ static const rb_parser_config_t rb_global_parser_config = {
+     .ary_new_from_args = rb_ary_new_from_args,
+     .ary_unshift = rb_ary_unshift,
+ 
+-    .make_temporary_id = rb_make_temporary_id,
++    .make_temporary_id = make_temporary_id, // use make_temporary_id for Kanayago
+     .is_local_id = is_local_id2,
+     .is_attrset_id = is_attrset_id2,
+     .is_global_name_punct = is_global_name_punct,
+@@ -365,7 +403,7 @@ static const rb_parser_config_t rb_global_parser_config = {
+ 
+     .int2num = rb_int2num_inline,
+ 
+-    .stderr_tty_p = rb_stderr_tty_p,
++    .stderr_tty_p = stderr_tty_p, //use stderr_tty_p for Kanayago
+     .write_error_str = rb_write_error_str,
+     .io_write = rb_io_write,
+     .io_flush = rb_io_flush,
+@@ -412,8 +450,8 @@ static const rb_parser_config_t rb_global_parser_config = {
+     .gc_guard = gc_guard,
+     .gc_mark = rb_gc_mark,
+ 
+-    .reg_compile = rb_reg_compile,
+-    .reg_check_preprocess = rb_reg_check_preprocess,
++    .reg_compile = reg_compile, // use reg_compile for Kanayago
++    .reg_check_preprocess = reg_check_preprocess, // use reg_check_preprocess for Kanayago
+     .memcicmp = rb_memcicmp,
+ 
+     .compile_warn = rb_compile_warn,
+@@ -443,27 +481,6 @@ static const rb_parser_config_t rb_global_parser_config = {
+ };
+ #endif
+ 
+-enum lex_type {
+-    lex_type_str,
+-    lex_type_io,
+-    lex_type_array,
+-    lex_type_generic,
+-};
+-
+-struct ruby_parser {
+-    rb_parser_t *parser_params;
+-    enum lex_type type;
+-    union {
+-        struct lex_pointer_string lex_str;
+-        struct {
+-            VALUE file;
+-        } lex_io;
+-        struct {
+-            VALUE ary;
+-        } lex_array;
+-    } data;
+-};
+-
+ static void
+ parser_mark(void *ptr)
+ {
+@@ -501,7 +518,8 @@ parser_memsize(const void *ptr)
+     return rb_ruby_parser_memsize(parser->parser_params);
+ }
+ 
+-static const rb_data_type_t ruby_parser_data_type = {
++// Not static const for Kanayago
++const rb_data_type_t ruby_parser_data_type = {
+     "parser",
+     {
+         parser_mark,