kanayago 0.3.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5a3eb2ad59c4bf7537be2abff7da6f0b93e79173d8fa6ae51dee86a8966ee83b
-  data.tar.gz: c2c4608ccf7ef25054abd327702f6fbd1713c31769bb78062290d8248bce9b0f
+  metadata.gz: d25dec3b7633f7b58a2fe0ad33b1e6f05ef7e47bf5898d7b468a9bd60634c462
+  data.tar.gz: becaefd024bdf3b3a196c8971fac45211e69e13e2396d672d383795c98ca9038
 SHA512:
-  metadata.gz: 16dd25fc0a69b15b85010abd4bb4784d2559cd7a5a0024bd4b60814fa2b376249d222a1c16cd16c049db31cbe855fb12eb5571e3af872e9d83d36a08e9fdd6f8
-  data.tar.gz: 07b9d5a878182eedb53d637dd6f4a02d8b53fdd8b0f7a6786ce045d3269abc52843c9792efcd9f482d1f7ebf4e7fa7e051548b998f48f81703799b975bf85fd1
+  metadata.gz: 3f7089b463e7a7a3024f6a249dec5902e8ca399826c996027f513b76e32ccb2f43c650f784c55354b2cb731c1cac00cd7c625a76e1c82b998e428872882ce0cd
+  data.tar.gz: bcaf717b512cff34f3b31e1cf08eaf23789a6c93469b55b0b466dacbd4227a8be372357b7f28926238fb8e1eab014b476f30b1bd32033222ed7f014c7793823f

data/CHANGELOG.md

@@ -0,0 +1,272 @@
+# Changelog
+
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+## [0.4.1]
+
+### Fixed
+- Fix segmentation fault when parsing dynamic symbols in complex hash structures
+- Fix segmentation fault when parsing nested modules with outer constant references
+- Fix `module_node_new` to use `RNODE_MODULE` instead of incorrect `RNODE_CLASS` macro
+- Add NULL pointer checks in `dynamic_string_node_new`, `dynamic_symbol_node_new`, `dynamic_execute_string_node_new`, and `dynamic_regexp_node_new`
+
+### Changed
+- Remove incorrect `@super` field access from `ModuleNode` (modules do not have superclasses)
+
+## [0.4.0]
+
+### Added
+- Add Ruby class definitions for previously C-only AST nodes:
+  - `ScopeNode` - Scope representation with args and body
+  - `ClassNode` - Class definition with cpath, super, and body
+  - `ModuleNode` - Module definition with cpath, super, and body
+  - `DefinitionNode` - Method definition with mid and defn
+  - `BeginNode` - Begin statement with body
+  - `SelfNode` - Self reference with state
+  - `ConstantNode` - Constant reference with vid
+  - `OperatorCallNode` - Operator method call with recv, mid, and args
+  - `CallNode` - Method call with recv, mid, and args
+  - `FunctionCallNode` - Function call with mid and args
+  - `VariableCallNode` - Variable call with mid
+  - `ArgumentsNode` - Arguments information with ainfo hash
+  - `BlockNode` - Block representation (inherits from Array)
+  - `ConstantDeclarationNode` - Constant declaration with vid, else, and value
+  - `Colon2Node` - Scoped constant resolution (::) with mid and head
+  - `Colon3Node` - Top-level constant resolution (::) with mid
+
+### Changed
+- Use `rb_intern("@...")` instead of `symbol()` macro for instance variable access in C layer
+- Remove redundant getter methods from C layer (scope_node.c and kanayago.c)
+- Rely on Ruby's `attr_reader` for attribute access instead of C-defined methods
+
+### Fixed
+- Fix SEGV in args_ainfo_tohash function
+
+## [0.3.0] - 2025-10-25
+
+### Fixed
+- Fix gem install kanayago
+
+## [0.2.0] - 2025-10-25
+
+### Added
+- Add sample for Kanayago usecase
+- Support NODE_FOR_MASGN, NODE_MASGN, NODE_DASGN, NODE_ONCE, NODE_ERRINFO, NODE_POSTEXE, and NODE_ERROR
+- Support NODE_ARGS_AUX, NODE_OPT_ARG, NODE_KW_ARG, NODE_POSTARG, NODE_ARGSCAT, and NODE_ARGSPUSH
+- Support NODE_SPLAT and NODE_BLOCK_PASS
+- Support NODE_YIELD and NODE_LAMBDA
+- Support NODE_OP_ASGN1, NODE_OP_ASGN2, NODE_OP_ASGN_AND, NODE_OP_ASGN_OR and NODE_OP_CDECL
+- Support NODE_NTH_REF and NODE_BACK_REF
+- Support NODE_DVAR
+- Support NODE_DSYM
+- Support NODE_BREAK and NODE_NEXT
+- Support NODE_REDO
+- Support NODE_DEFINED
+- Support NODE_ITER, NODE_RETRY, NODE_RESCUE, NODE_RESBODY and NODE_ENSURE
+- Support NODE_HASH, NODE_IN, NODE_ARYPTN, NODE_HSHPTN and NODE_FNDPTN
+- Support NODE_MATCH, NODE_MATCH2 and NODE_MATCH3
+- Support NODE_REGX and NODE_DREGX
+- Support NODE_XSTR and NODE_DXSTR
+- Support NODE_FLIP2 and NODE_FLIP3
+- Support NODE_DOT2 and NODE_DOT3
+- Support NODE_CASE, NODE_CASE2, NODE_CASE3 and NODE_WHEN
+- Support NODE_QCALL, NODE_SUPER and NODE_ZSUPER
+- Support NODE_DEFS, NODE_SCLASS and NODE_ATTRASGN
+- Support NODE_COLON3
+- Support NODE_VCALL
+- Support NODE_CVASGN
+- Support NODE_IASGN
+- Support NODE_DSTR and NODE_EVSTR
+- Support NODE_GASGN
+- Support NODE_RETURN
+- Support NODE_UNDEF
+- Support NODE_VALIAS
+- Support NODE_ALIAS
+- Support NODE_FOR
+- Support NODE_UNTIL
+- Add NODE_WHILE test
+- Support NODE_WHILE
+- Support NODE_CVAR
+- Introduce debug.gem
+- Support NODE_MODULE
+- Support NODE_SELF
+- Support NODE_GVAR
+- Support NODE_AND
+- Support NODE_OR
+- Support NODE_FALSE
+- Support NODE_TRUE
+- Support NODE_NIL
+- Support NODE_ENCODING
+- Add typeprof.conf.json
+- Support NODE_ZLIST
+- Introduce TypeProf for development
+- Support __LINE__ literal node
+- Support __FILE__ literal node
+- Support Ruby 3.4
+- Introduce Kanayago gem build and install CI
+
+### Changed
+- Update RuboCop
+- Split kanayago.patch file to more easier maintain multi Ruby Parser
+- Update bin/setup
+- Use Node class attr_reader to access Node values
+- Split Literal Node code
+- Split Kanayago::ScopeNode code
+- Update README.md
+- Update test CI
+- Update kanayago.patch
+- Improve import Ruby Parser file's
+- Update RuboCop setting
+- Migrate to Kanayago parsed AST hash to Instance
+- Update kanayago.patch for Ruby head build
+- Update CI flow
+- Update Kanayago build flow
+- Update Ruby Parser's file
+- Update lrama
+- Split file for Variable Node's
+- Move Statement Node class definition
+- Rename LeftAssignNode to LocalAssignmentNode
+
+### Fixed
+- Fix RuboCop Lint error
+- Fix NODE_IF attributes access
+- Fix Kanayago::ListNode holds data
+- Fix NODE_FOR loop
+- Fix Ruby head build failure
+- Add internal/namespace.h for Ruby head Parser dependency
+- Fix RuboCop SEGV in Ruby head
+- Apply auto correct
+- Update json
+- Update zlib
+- Fix CI failures
+- Add ext/kanayago/probes.h
+- Fix Ruby 3.4 dependency
+- Fix Ruby 3.4 build
+- Fix file copy error handling
+- Fix build gem
+- Add dependency for Universal Parser
+- Fix code lint
+
+### Removed
+- Remove unneeded comment
+- Remove Lrama that unneeded any more
+
+### CI
+- Add fail-fast: false
+- Suppress already initialized constant warning
+
+## [0.1.1] - 2024-09-06
+
+### Changed
+- Bump up v0.1.1
+
+## [0.1.0] - 2024-09-06
+
+### Added
+- Support NODE_UNLESS
+- Add class description
+- Add rubocop check in CI
+- Add rubocop-on-rbs
+- Add rubocop-rake
+- Add rubocop and rubocop-minitest for development
+- Add refine_tree_parse module function
+- Support NODE_IVAR
+- Add Referenced implementations link
+- Support NODE_SYM
+- Support method definition
+- Add NODE_CONST test
+- Support NODE_CDECL
+- Support NODE_CONST
+- Support NODE_IF
+- Support NODE_LVAR
+- Add gdb rake task
+- Support NODE_FCALL
+- Introduce literal_node_to_hash function for get literal node value
+- Support NODE_LASGN
+- Add NODE_STR parse test
+- Add NODE_IMAGINARY parse test
+- Add NODE_RATIONAL parse test
+- Add NODE_FLOAT parse test
+- Add parse NODE_INTEGER test
+- Add GitHub Actions for test
+- Add Ruby's Parser files
+- Add run task for running test.rb
+- Add test for NODE_INTEGER
+- Support NODE_CALL
+- Support NODE_STR
+- Support NODE_IMAGINARY
+- Support NODE_BLOCK
+- Support NODE_RATIONAL
+- Support NODE_FLOAT
+- Support NODE_OPCALL and NODE_LIST
+- Parse Ruby code and return Hash
+- Build Mjollnir with Ruby Parser
+- Build ruby-parser for Mjollnir
+- Add ruby_parser:build task
+- Add lex.c generation for ruby_parser:import task
+- Add ruby_parser:clean task
+- Add Mjollnir.parse method
+- Import ruby parser
+- Add lrama
+- Add 金屋子 for README.md
+
+### Changed
+- Rename parse to kanayago_parse
+- Using test-queue
+- Auto correct to Gemfile
+- Auto correct Hash
+- Fix required_ruby_version to > 3.3.0
+- Rename to Kanayago
+- Ignore refine_tree.gemspec in Metrics/BlockLength
+- Format Rakefile
+- Rename sig/refine_tree.rb to sig/refine_tree.rbs
+- require rubocop-minitest and rubocop-rake
+- Generate .rubocop.yml and .rubocop_todo.yml
+- Move minitest to test group in Gemfile
+- Change to key type from String to Symbol
+- Fix require path for test
+- Fix install gem name
+- Rename to RefineTree
+- Fix GitHub Actions
+- Add PATH for GitHub Actions
+- Add install check for GitHub Actions
+- Add depend task for rake build and rake install
+- Fix Mjollnir.parse sample in README.md
+- Fix username in README.md
+- Merge Ruby's Parser struct and enum definition for Mjollnir
+- Fix Mjollnir gem summary and description
+- Fix gem's description
+- Fix README.md
+- Fix Mjollnir gem build and install
+- Apply RuboCop auto correct to Gemfile
+- Apply RuboCop auto correct for test helper
+- Apply RuboCop auto correct
+- Fix Mjollnir build
+- Update TODO's
+
+### Fixed
+- Fix SEGV
+- Fix NODE_BLOCK support
+- Remove allowed_push_host
+- Remove parse.c and parse.h
+- Ignore parse.c and parse.h
+- Fix gem name in GitHub Action
+
+### Removed
+- Remove uneeded file
+- Remove unnecessary include header
+- Remove unnecessary code in Rakefile
+- Remove ext/mjollnir/ruby-parser directory
+- Remove uneeded headers
+- Remove gem build for CI
+
+### Internal
+- Suppress warning
+- Add newline
+- Some refactor for mjollnir.c
+- Using rb_ruby_ast_data_get function

data/README.md

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

data/ext/kanayago/kanayago.c

@@ -33,84 +33,36 @@ operator_call_node_new(const NODE *node)
 {
     VALUE obj = rb_class_new_instance(0, 0, rb_cOperatorCallNode);
 
-    rb_ivar_set(obj, symbol("recv"), ast_to_node_instance(RNODE_OPCALL(node)->nd_recv));
-    rb_ivar_set(obj, symbol("mid"), ID2SYM(RNODE_OPCALL(node)->nd_mid));
-    rb_ivar_set(obj, symbol("args"), ast_to_node_instance(RNODE_OPCALL(node)->nd_args));
+    rb_ivar_set(obj, rb_intern("@recv"), ast_to_node_instance(RNODE_OPCALL(node)->nd_recv));
+    rb_ivar_set(obj, rb_intern("@mid"), ID2SYM(RNODE_OPCALL(node)->nd_mid));
+    rb_ivar_set(obj, rb_intern("@args"), ast_to_node_instance(RNODE_OPCALL(node)->nd_args));
 
     return obj;
 }
 
-static VALUE
-operator_call_node_recv_get(VALUE self)
-{
-    return rb_ivar_get(self, symbol("recv"));
-}
-
-static VALUE
-operator_call_node_mid_get(VALUE self)
-{
-    return rb_ivar_get(self, symbol("mid"));
-}
-
-static VALUE
-operator_call_node_args_get(VALUE self)
-{
-    return rb_ivar_get(self, symbol("args"));
-}
-
 static VALUE
 call_node_new(const NODE *node)
 {
     VALUE result = rb_class_new_instance(0, 0, rb_cCallNode);
 
-    rb_ivar_set(result, symbol("recv"), ast_to_node_instance(RNODE_OPCALL(node)->nd_recv));
-    rb_ivar_set(result, symbol("mid"), ID2SYM(RNODE_CALL(node)->nd_mid));
-    rb_ivar_set(result, symbol("args"), ast_to_node_instance(RNODE_CALL(node)->nd_args));
+    rb_ivar_set(result, rb_intern("@recv"), ast_to_node_instance(RNODE_OPCALL(node)->nd_recv));
+    rb_ivar_set(result, rb_intern("@mid"), ID2SYM(RNODE_CALL(node)->nd_mid));
+    rb_ivar_set(result, rb_intern("@args"), ast_to_node_instance(RNODE_CALL(node)->nd_args));
 
     return result;
 }
 
-static VALUE
-call_node_recv_get(VALUE self)
-{
-    return rb_ivar_get(self, symbol("recv"));
-}
-
-static VALUE
-call_node_mid_get(VALUE self)
-{
-    return rb_ivar_get(self, symbol("mid"));
-}
-
-static VALUE
-call_node_args_get(VALUE self)
-{
-    return rb_ivar_get(self, symbol("args"));
-}
-
 static VALUE
 function_call_node_new(const NODE *node)
 {
     VALUE obj = rb_class_new_instance(0, 0, rb_cFunctionCallNode);
 
-    rb_ivar_set(obj, symbol("mid"), ID2SYM(RNODE_FCALL(node)->nd_mid));
-    rb_ivar_set(obj, symbol("args"), ast_to_node_instance(RNODE_FCALL(node)->nd_args));
+    rb_ivar_set(obj, rb_intern("@mid"), ID2SYM(RNODE_FCALL(node)->nd_mid));
+    rb_ivar_set(obj, rb_intern("@args"), ast_to_node_instance(RNODE_FCALL(node)->nd_args));
 
     return obj;
 }
 
-static VALUE
-function_call_node_mid_get(VALUE self)
-{
-    return rb_ivar_get(self, symbol("mid"));
-}
-
-static VALUE
-function_call_node_args_get(VALUE self)
-{
-    return rb_ivar_get(self, symbol("args"));
-}
-
 static VALUE
 variable_call_node_new(const NODE *node)
 {
@@ -121,12 +73,6 @@ variable_call_node_new(const NODE *node)
     return obj;
 }
 
-static VALUE
-variable_call_node_mid_get(VALUE self)
-{
-    return rb_ivar_get(self, rb_intern("@mid"));
-}
-
 static VALUE
 list_node_new(const NODE *node)
 {
@@ -151,24 +97,12 @@ definition_node_new(const NODE *node)
 {
     VALUE obj = rb_class_new_instance(0, 0, rb_cDefinitionNode);
 
-    rb_ivar_set(obj, symbol("mid"), ID2SYM(RNODE_DEFN(node)->nd_mid));
-    rb_ivar_set(obj, symbol("defn"), ast_to_node_instance(RNODE_DEFN(node)->nd_defn));
+    rb_ivar_set(obj, rb_intern("@mid"), ID2SYM(RNODE_DEFN(node)->nd_mid));
+    rb_ivar_set(obj, rb_intern("@defn"), ast_to_node_instance(RNODE_DEFN(node)->nd_defn));
 
     return obj;
 }
 
-static VALUE
-definition_node_mid_get(VALUE self)
-{
-    return rb_ivar_get(self, symbol("mid"));
-}
-
-static VALUE
-definition_node_defn_get(VALUE self)
-{
-    return rb_ivar_get(self, symbol("defn"));
-}
-
 static VALUE
 block_node_new(const NODE *node)
 {
@@ -188,47 +122,23 @@ constant_node_new(const NODE *node)
 {
     VALUE obj = rb_class_new_instance(0, 0, rb_cConstantNode);
 
-    rb_ivar_set(obj, symbol("vid"), ID2SYM(RNODE_CONST(node)->nd_vid));
+    rb_ivar_set(obj, rb_intern("@vid"), ID2SYM(RNODE_CONST(node)->nd_vid));
 
     return obj;
 }
 
-static VALUE
-constant_node_vid_get(VALUE self)
-{
-    return rb_ivar_get(self, symbol("vid"));
-}
-
 static VALUE
 constant_declaration_node_new(const NODE *node)
 {
     VALUE obj = rb_class_new_instance(0, 0, rb_cConstantDeclarationNode);
 
-    rb_ivar_set(obj, symbol("vid"), ID2SYM(RNODE_CDECL(node)->nd_vid));
-    rb_ivar_set(obj, symbol("else"), ast_to_node_instance(RNODE_CDECL(node)->nd_else));
-    rb_ivar_set(obj, symbol("value"), ast_to_node_instance(RNODE_CDECL(node)->nd_value));
+    rb_ivar_set(obj, rb_intern("@vid"), ID2SYM(RNODE_CDECL(node)->nd_vid));
+    rb_ivar_set(obj, rb_intern("@else"), ast_to_node_instance(RNODE_CDECL(node)->nd_else));
+    rb_ivar_set(obj, rb_intern("@value"), ast_to_node_instance(RNODE_CDECL(node)->nd_value));
 
     return obj;
 }
 
-static VALUE
-constant_declaration_node_vid_get(VALUE self)
-{
-    return rb_ivar_get(self, symbol("vid"));
-}
-
-static VALUE
-constant_declaration_node_else_get(VALUE self)
-{
-    return rb_ivar_get(self, symbol("else"));
-}
-
-static VALUE
-constant_declaration_node_value_get(VALUE self)
-{
-    return rb_ivar_get(self, symbol("value"));
-}
-
 static VALUE
 node_literal_to_hash(const NODE *node)
 {
@@ -271,39 +181,20 @@ class_node_new(const NODE *node)
 {
     VALUE obj = rb_class_new_instance(0, 0, rb_cClassNode);
 
-    rb_ivar_set(obj, symbol("cpath"), ast_to_node_instance(RNODE_CLASS(node)->nd_cpath));
-    rb_ivar_set(obj, symbol("super"), ast_to_node_instance(RNODE_CLASS(node)->nd_super));
-    rb_ivar_set(obj, symbol("body"), ast_to_node_instance(RNODE_CLASS(node)->nd_body));
+    rb_ivar_set(obj, rb_intern("@cpath"), ast_to_node_instance(RNODE_CLASS(node)->nd_cpath));
+    rb_ivar_set(obj, rb_intern("@super"), ast_to_node_instance(RNODE_CLASS(node)->nd_super));
+    rb_ivar_set(obj, rb_intern("@body"), ast_to_node_instance(RNODE_CLASS(node)->nd_body));
 
     return obj;
 }
 
-static VALUE
-class_node_cpath_get(VALUE self)
-{
-    return rb_ivar_get(self, symbol("cpath"));
-}
-
-static VALUE
-class_node_super_get(VALUE self)
-{
-    return rb_ivar_get(self, symbol("super"));
-}
-
-static VALUE
-class_node_body_get(VALUE self)
-{
-    return rb_ivar_get(self, symbol("body"));
-}
-
 static VALUE
 module_node_new(const NODE *node)
 {
     VALUE obj = rb_class_new_instance(0, 0, rb_cModuleNode);
 
-    rb_ivar_set(obj, rb_intern("@cpath"), ast_to_node_instance(RNODE_CLASS(node)->nd_cpath));
-    rb_ivar_set(obj, rb_intern("@super"), ast_to_node_instance(RNODE_CLASS(node)->nd_super));
-    rb_ivar_set(obj, rb_intern("@body"), ast_to_node_instance(RNODE_CLASS(node)->nd_body));
+    rb_ivar_set(obj, rb_intern("@cpath"), ast_to_node_instance(RNODE_MODULE(node)->nd_cpath));
+    rb_ivar_set(obj, rb_intern("@body"), ast_to_node_instance(RNODE_MODULE(node)->nd_body));
 
     return obj;
 }
@@ -313,24 +204,12 @@ colon2_node_new(const NODE *node)
 {
     VALUE obj = rb_class_new_instance(0, 0, rb_cColon2Node);
 
-    rb_ivar_set(obj, symbol("mid"), ID2SYM(RNODE_COLON2(node)->nd_mid));
-    rb_ivar_set(obj, symbol("head"), ast_to_node_instance(RNODE_COLON2(node)->nd_head));
+    rb_ivar_set(obj, rb_intern("@mid"), ID2SYM(RNODE_COLON2(node)->nd_mid));
+    rb_ivar_set(obj, rb_intern("@head"), ast_to_node_instance(RNODE_COLON2(node)->nd_head));
 
     return obj;
 }
 
-static VALUE
-colon2_node_mid_get(VALUE self)
-{
-    return rb_ivar_get(self, symbol("mid"));
-}
-
-static VALUE
-colon2_node_head_get(VALUE self)
-{
-    return rb_ivar_get(self, symbol("head"));
-}
-
 static VALUE
 colon3_node_new(const NODE *node)
 {
@@ -341,28 +220,16 @@ colon3_node_new(const NODE *node)
     return obj;
 }
 
-static VALUE
-colon3_node_mid_get(VALUE self)
-{
-    return rb_ivar_get(self, rb_intern("@mid"));
-}
-
 static VALUE
 begin_node_new(const NODE *node)
 {
     VALUE obj = rb_class_new_instance(0, 0, rb_cBeginNode);
 
-    rb_ivar_set(obj, symbol("body"), ast_to_node_instance(RNODE_BEGIN(node)->nd_body));
+    rb_ivar_set(obj, rb_intern("@body"), ast_to_node_instance(RNODE_BEGIN(node)->nd_body));
 
     return obj;
 }
 
-static VALUE
-begin_node_body_get(VALUE self)
-{
-    return rb_ivar_get(self, symbol("body"));
-}
-
 static VALUE
 args_ainfo_to_hash(const struct rb_args_info ainfo)
 {
@@ -373,9 +240,11 @@ args_ainfo_to_hash(const struct rb_args_info ainfo)
     rb_hash_aset(result, symbol("pre_init"), ast_to_node_instance(ainfo.pre_init));
     rb_hash_aset(result, symbol("post_args_num"), INT2NUM(ainfo.post_args_num));
     rb_hash_aset(result, symbol("post_init"), ast_to_node_instance(ainfo.post_init));
-    rb_hash_aset(result, symbol("first_post_arg"), Qnil);
-    rb_hash_aset(result, symbol("rest_arg"), Qnil);
-    rb_hash_aset(result, symbol("block_arg"), Qnil);
+
+    rb_hash_aset(result, symbol("first_post_arg"), ainfo.first_post_arg ? ID2SYM(ainfo.first_post_arg) : Qnil);
+    rb_hash_aset(result, symbol("rest_arg"), ainfo.rest_arg ? ID2SYM(ainfo.rest_arg) : Qnil);
+    rb_hash_aset(result, symbol("block_arg"), ainfo.block_arg ? ID2SYM(ainfo.block_arg) : Qnil);
+
     rb_hash_aset(result, symbol("opt_args"), ast_to_node_instance((const NODE *)(ainfo.opt_args)));
     rb_hash_aset(result, symbol("kw_args"), ast_to_node_instance((const NODE *)(ainfo.kw_args)));
     rb_hash_aset(result, symbol("kw_rest_arg"), ast_to_node_instance(ainfo.kw_rest_arg));
@@ -389,17 +258,11 @@ arguments_node_new(const NODE *node)
     VALUE obj = rb_class_new_instance(0, 0, rb_cArgumentsNode);
     VALUE ainfo_hash = args_ainfo_to_hash(RNODE_ARGS(node)->nd_ainfo);
 
-    rb_ivar_set(obj, symbol("ainfo"), ainfo_hash);
+    rb_ivar_set(obj, rb_intern("@ainfo"), ainfo_hash);
 
     return obj;
 }
 
-static VALUE
-arguments_node_ainfo_get(VALUE self)
-{
-    return rb_ivar_get(self, symbol("ainfo"));
-}
-
 static VALUE
 self_node_new(const NODE *node)
 {
@@ -419,6 +282,10 @@ ast_to_node_instance(const NODE *node)
         return Qnil;
     }
 
+    if (node == (NODE *)-1) {
+        return Qnil;
+    }
+
     type = nd_type(node);
 
     switch (type) {
@@ -674,38 +541,22 @@ Init_kanayago(void)
     Init_StringNode(rb_mKanayago);
 
     rb_cConstantNode = rb_define_class_under(rb_mKanayago, "ConstantNode", rb_cObject);
-    rb_define_method(rb_cConstantNode, "vid", constant_node_vid_get, 0);
 
     rb_cConstantDeclarationNode = rb_define_class_under(rb_mKanayago, "ConstantDeclarationNode", rb_cObject);
-    rb_define_method(rb_cConstantDeclarationNode, "vid", constant_declaration_node_vid_get, 0);
-    rb_define_method(rb_cConstantDeclarationNode, "else", constant_declaration_node_else_get, 0);
-    rb_define_method(rb_cConstantDeclarationNode, "value", constant_declaration_node_value_get, 0);
 
     rb_cDefinitionNode = rb_define_class_under(rb_mKanayago, "DefinitionNode", rb_cObject);
-    rb_define_method(rb_cDefinitionNode, "mid", definition_node_mid_get, 0);
-    rb_define_method(rb_cDefinitionNode, "defn", definition_node_defn_get, 0);
 
     rb_cOperatorCallNode = rb_define_class_under(rb_mKanayago, "OperatorCallNode", rb_cObject);
-    rb_define_method(rb_cOperatorCallNode, "recv", operator_call_node_recv_get, 0);
-    rb_define_method(rb_cOperatorCallNode, "mid", operator_call_node_mid_get, 0);
-    rb_define_method(rb_cOperatorCallNode, "args", operator_call_node_args_get, 0);
 
     rb_cListNode = rb_define_class_under(rb_mKanayago, "ListNode", rb_cObject);
 
     rb_cArgumentsNode = rb_define_class_under(rb_mKanayago, "ArgumentsNode", rb_cObject);
-    rb_define_method(rb_cArgumentsNode, "ainfo", arguments_node_ainfo_get, 0);
 
     rb_cCallNode = rb_define_class_under(rb_mKanayago, "CallNode", rb_cObject);
-    rb_define_method(rb_cCallNode, "recv", call_node_recv_get, 0);
-    rb_define_method(rb_cCallNode, "mid", call_node_mid_get, 0);
-    rb_define_method(rb_cCallNode, "args", call_node_args_get, 0);
 
     rb_cFunctionCallNode = rb_define_class_under(rb_mKanayago, "FunctionCallNode", rb_cObject);
-    rb_define_method(rb_cFunctionCallNode, "mid", function_call_node_mid_get, 0);
-    rb_define_method(rb_cFunctionCallNode, "args", function_call_node_args_get, 0);
 
     rb_cVariableCallNode = rb_define_class_under(rb_mKanayago, "VariableCallNode", rb_cObject);
-    rb_define_method(rb_cVariableCallNode, "mid", variable_call_node_mid_get, 0);
 
     // For Statement Node(e.g. Kanayago::IfStatementNode)
     Init_StatementNode(rb_mKanayago);
@@ -713,21 +564,14 @@ Init_kanayago(void)
     rb_cBlockNode = rb_define_class_under(rb_mKanayago, "BlockNode", rb_cArray);
 
     rb_cBeginNode = rb_define_class_under(rb_mKanayago, "BeginNode", rb_cObject);
-    rb_define_method(rb_cBeginNode, "body", begin_node_body_get, 0);
 
     rb_cClassNode = rb_define_class_under(rb_mKanayago, "ClassNode", rb_cObject);
-    rb_define_method(rb_cClassNode, "cpath", class_node_cpath_get, 0);
-    rb_define_method(rb_cClassNode, "super", class_node_super_get, 0);
-    rb_define_method(rb_cClassNode, "body", class_node_body_get, 0);
 
     rb_cModuleNode = rb_define_class_under(rb_mKanayago, "ModuleNode", rb_cObject);
 
     rb_cColon2Node = rb_define_class_under(rb_mKanayago, "Colon2Node", rb_cObject);
-    rb_define_method(rb_cColon2Node, "mid", colon2_node_mid_get, 0);
-    rb_define_method(rb_cColon2Node, "head", colon2_node_head_get, 0);
 
     rb_cColon3Node = rb_define_class_under(rb_mKanayago, "Colon3Node", rb_cObject);
-    rb_define_method(rb_cColon3Node, "mid", colon3_node_mid_get, 0);
 
     // For Variable Node(e.g. Kanayago::LocalVariableNode)
     Init_VariableNode(rb_mKanayago);

data/ext/kanayago/scope_node.c

@@ -7,28 +7,14 @@ scope_node_new(const NODE *node)
 {
     VALUE result = rb_class_new_instance(0, 0, rb_cScopeNode);
 
-    rb_ivar_set(result, symbol("args"), ast_to_node_instance((const NODE *)(RNODE_SCOPE(node)->nd_args)));
-    rb_ivar_set(result, symbol("body"), ast_to_node_instance(RNODE_SCOPE(node)->nd_body));
+    rb_ivar_set(result, rb_intern("@args"), ast_to_node_instance((const NODE *)(RNODE_SCOPE(node)->nd_args)));
+    rb_ivar_set(result, rb_intern("@body"), ast_to_node_instance(RNODE_SCOPE(node)->nd_body));
 
     return result;
 }
 
-static VALUE
-scope_node_args_get(VALUE self)
-{
-    return rb_ivar_get(self, symbol("args"));
-}
-
-static VALUE
-scope_node_body_get(VALUE self)
-{
-    return rb_ivar_get(self, symbol("body"));
-}
-
 void
 Init_ScopeNode(VALUE module)
 {
     rb_cScopeNode = rb_define_class_under(module, "ScopeNode", rb_cObject);
-    rb_define_method(rb_cScopeNode, "args", scope_node_args_get, 0);
-    rb_define_method(rb_cScopeNode, "body", scope_node_body_get, 0);
 }

data/ext/kanayago/string_node.c

@@ -19,12 +19,22 @@ dynamic_string_node_new(const NODE *node)
 {
     VALUE obj = rb_class_new_instance(0, 0, rb_cDynamicStringNode);
     rb_parser_string_t *str = RNODE_DSTR(node)->string;
-    rb_encoding *enc = str->enc;
-    char *ptr = str->ptr;
-    long len = str->len;
-
-    rb_ivar_set(obj, rb_intern("@string"), rb_enc_str_new(ptr, len, enc));
-    rb_ivar_set(obj, rb_intern("@next_nodes"), ast_to_node_instance((const NODE *)RNODE_DSTR(node)->nd_next));
+    const NODE *nd_next = (const NODE *)RNODE_DSTR(node)->nd_next;
+
+    if (str) {
+        rb_encoding *enc = str->enc;
+        char *ptr = str->ptr;
+        long len = str->len;
+        rb_ivar_set(obj, rb_intern("@string"), rb_enc_str_new(ptr, len, enc));
+    } else {
+        rb_ivar_set(obj, rb_intern("@string"), rb_str_new("", 0));
+    }
+
+    if (nd_next && nd_next != (NODE *)-1) {
+        rb_ivar_set(obj, rb_intern("@next_nodes"), ast_to_node_instance(nd_next));
+    } else {
+        rb_ivar_set(obj, rb_intern("@next_nodes"), Qnil);
+    }
 
     return obj;
 }
@@ -34,12 +44,22 @@ dynamic_symbol_node_new(const NODE *node)
 {
     VALUE obj = rb_class_new_instance(0, 0, rb_cDynamicSymbolNode);
     rb_parser_string_t *str = RNODE_DSYM(node)->string;
-    rb_encoding *enc = str->enc;
-    char *ptr = str->ptr;
-    long len = str->len;
-
-    rb_ivar_set(obj, rb_intern("@string"), rb_enc_str_new(ptr, len, enc));
-    rb_ivar_set(obj, rb_intern("@next_nodes"), ast_to_node_instance((const NODE *)RNODE_DSYM(node)->nd_next));
+    const NODE *nd_next = (const NODE *)RNODE_DSYM(node)->nd_next;
+
+    if (str) {
+        rb_encoding *enc = str->enc;
+        char *ptr = str->ptr;
+        long len = str->len;
+        rb_ivar_set(obj, rb_intern("@string"), rb_enc_str_new(ptr, len, enc));
+    } else {
+        rb_ivar_set(obj, rb_intern("@string"), rb_str_new("", 0));
+    }
+
+    if (nd_next && nd_next != (NODE *)-1) {
+        rb_ivar_set(obj, rb_intern("@next_nodes"), ast_to_node_instance(nd_next));
+    } else {
+        rb_ivar_set(obj, rb_intern("@next_nodes"), Qnil);
+    }
 
     return obj;
 }
@@ -77,12 +97,22 @@ dynamic_execute_string_node_new(const NODE *node)
 {
     VALUE obj = rb_class_new_instance(0, 0, rb_cDynamicExecuteStringNode);
     rb_parser_string_t *str = RNODE_DXSTR(node)->string;
-    rb_encoding *enc = str->enc;
-    char *ptr = str->ptr;
-    long len = str->len;
-
-    rb_ivar_set(obj, rb_intern("@string"), rb_enc_str_new(ptr, len, enc));
-    rb_ivar_set(obj, rb_intern("@next_nodes"), ast_to_node_instance((const NODE *)RNODE_DXSTR(node)->nd_next));
+    const NODE *nd_next = (const NODE *)RNODE_DXSTR(node)->nd_next;
+
+    if (str) {
+        rb_encoding *enc = str->enc;
+        char *ptr = str->ptr;
+        long len = str->len;
+        rb_ivar_set(obj, rb_intern("@string"), rb_enc_str_new(ptr, len, enc));
+    } else {
+        rb_ivar_set(obj, rb_intern("@string"), rb_str_new("", 0));
+    }
+
+    if (nd_next && nd_next != (NODE *)-1) {
+        rb_ivar_set(obj, rb_intern("@next_nodes"), ast_to_node_instance(nd_next));
+    } else {
+        rb_ivar_set(obj, rb_intern("@next_nodes"), Qnil);
+    }
 
     return obj;
 }
@@ -112,13 +142,24 @@ dynamic_regexp_node_new(const NODE *node)
 {
     VALUE obj = rb_class_new_instance(0, 0, rb_cDynamicRegexpNode);
     rb_parser_string_t *str = RNODE_DREGX(node)->string;
-    rb_encoding *enc = str->enc;
-    char *ptr = str->ptr;
-    long len = str->len;
     long options = RNODE_DREGX(node)->as.nd_cflag;
+    const NODE *nd_next = (const NODE *)RNODE_DREGX(node)->nd_next;
+
+    if (str) {
+        rb_encoding *enc = str->enc;
+        char *ptr = str->ptr;
+        long len = str->len;
+        rb_ivar_set(obj, rb_intern("@string"), rb_enc_str_new(ptr, len, enc));
+    } else {
+        rb_ivar_set(obj, rb_intern("@string"), rb_str_new("", 0));
+    }
+
+    if (nd_next && nd_next != (NODE *)-1) {
+        rb_ivar_set(obj, rb_intern("@next_nodes"), ast_to_node_instance(nd_next));
+    } else {
+        rb_ivar_set(obj, rb_intern("@next_nodes"), Qnil);
+    }
 
-    rb_ivar_set(obj, rb_intern("@string"), rb_enc_str_new(ptr, len, enc));
-    rb_ivar_set(obj, rb_intern("@next_nodes"), ast_to_node_instance((const NODE *)RNODE_DREGX(node)->nd_next));
     rb_ivar_set(obj, rb_intern("@options"), LONG2FIX(options));
 
     return obj;

data/ext/kanayago/variable_node.c

@@ -21,8 +21,9 @@ VALUE
 dynamic_variable_node_new(const NODE *node)
 {
     VALUE obj = rb_class_new_instance(0, 0, rb_cDynamicVariableNode);
+    ID vid = RNODE_DVAR(node)->nd_vid;
 
-    rb_ivar_set(obj, rb_intern("@vid"), ID2SYM(RNODE_DVAR(node)->nd_vid));
+    rb_ivar_set(obj, rb_intern("@vid"), vid ? ID2SYM(vid) : Qnil);
 
     return obj;
 }

data/lib/kanayago/call_node.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Kanayago
+  class OperatorCallNode
+    attr_reader :recv, :mid, :args
+  end
+
+  class CallNode
+    attr_reader :recv, :mid, :args
+  end
+
+  class FunctionCallNode
+    attr_reader :mid, :args
+  end
+
+  class VariableCallNode
+    attr_reader :mid
+  end
+end

data/lib/kanayago/constant_node.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Kanayago
+  class ConstantDeclarationNode
+    attr_reader :vid, :else, :value
+  end
+
+  class Colon2Node
+    attr_reader :mid, :head
+  end
+
+  class Colon3Node
+    attr_reader :mid
+  end
+end

data/lib/kanayago/literal_node.rb

@@ -84,4 +84,8 @@ module Kanayago
   class BackRefNode
     attr_reader :nth
   end
+
+  class SelfNode
+    attr_reader :state
+  end
 end

data/lib/kanayago/scope_node.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Kanayago
+  class ScopeNode
+    attr_reader :args, :body
+  end
+
+  class BlockNode # rubocop:disable Lint/EmptyClass
+  end
+
+  class ArgumentsNode
+    attr_reader :ainfo
+  end
+end

data/lib/kanayago/statement_node.rb

@@ -61,10 +61,22 @@ module Kanayago
     attr_reader :id, :value
   end
 
+  class DefinitionNode
+    attr_reader :mid, :defn
+  end
+
   class SingletonDefinitionNode
     attr_reader :recv, :mid, :defn
   end
 
+  class ClassNode
+    attr_reader :cpath, :super, :body
+  end
+
+  class ModuleNode
+    attr_reader :cpath, :body
+  end
+
   class SingletonClassNode
     attr_reader :recv, :body
   end
@@ -122,6 +134,10 @@ module Kanayago
     attr_reader :body, :iter
   end
 
+  class BeginNode
+    attr_reader :body
+  end
+
   class EnsureNode
     attr_reader :head, :ensr
   end

data/lib/kanayago/variable_node.rb

@@ -20,4 +20,8 @@ module Kanayago
   class GlobalVariableNode
     attr_reader :vid
   end
+
+  class ConstantNode
+    attr_reader :vid
+  end
 end

data/lib/kanayago/version.rb

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

data/lib/kanayago.rb

@@ -8,26 +8,13 @@ require_relative 'kanayago/string_node'
 require_relative 'kanayago/statement_node'
 require_relative 'kanayago/variable_node'
 require_relative 'kanayago/pattern_node'
+require_relative 'kanayago/call_node'
+require_relative 'kanayago/scope_node'
+require_relative 'kanayago/constant_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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kanayago
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.1
 platform: ruby
 authors:
 - S-H-GAMELINKS
@@ -20,6 +20,7 @@ files:
 - ".rubocop.yml"
 - ".rubocop_todo.yml"
 - ".ruby-version"
+- CHANGELOG.md
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -39,8 +40,11 @@ files:
 - ext/kanayago/variable_node.c
 - ext/kanayago/variable_node.h
 - lib/kanayago.rb
+- lib/kanayago/call_node.rb
+- lib/kanayago/constant_node.rb
 - lib/kanayago/literal_node.rb
 - lib/kanayago/pattern_node.rb
+- lib/kanayago/scope_node.rb
 - lib/kanayago/statement_node.rb
 - lib/kanayago/string_node.rb
 - lib/kanayago/variable_node.rb