kanayago 0.2.0 → 0.4.0

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,31 +181,13 @@ 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)
 {
@@ -313,24 +205,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 +221,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 +241,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 +259,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 +283,10 @@ ast_to_node_instance(const NODE *node)
         return Qnil;
     }
 
+    if (node == (NODE *)-1) {
+        return Qnil;
+    }
+
     type = nd_type(node);
 
     switch (type) {
@@ -674,38 +542,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 +565,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/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, :super, :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.2.0'
+  VERSION = '0.4.0'
 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