ast.c: fix calls

* ast.c (node_children): fix the member for method IDs as nd_mid.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63611 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 31 insertions, 3 deletions

diff --git a/ast.c b/ast.c
index 83125f001e..3a89686d10 100644
--- a/ast.c
+++ b/ast.c
@@ -298,13 +298,13 @@ node_children(rb_ast_t *ast, NODE *node)
       case NODE_OPCALL:
       case NODE_QCALL:
         return rb_ary_new_from_args(3, NEW_CHILD(ast, node->nd_recv),
-                                    ID2SYM(node->nd_vid),
+                                    ID2SYM(node->nd_mid),
                                     NEW_CHILD(ast, node->nd_args));
       case NODE_FCALL:
-        return rb_ary_new_from_args(2, ID2SYM(node->nd_vid),
+        return rb_ary_new_from_args(2, ID2SYM(node->nd_mid),
                                     NEW_CHILD(ast, node->nd_args));
       case NODE_VCALL:
-        return rb_ary_new_from_args(1, ID2SYM(node->nd_vid));
+        return rb_ary_new_from_args(1, ID2SYM(node->nd_mid));
       case NODE_SUPER:
         return rb_ary_new_from_node_args(ast, 1, node->nd_args);
       case NODE_ZSUPER:
diff --git a/test/ruby/test_ast.rb b/test/ruby/test_ast.rb
index 90c06fb5ce..5659cac6b0 100644
--- a/test/ruby/test_ast.rb
+++ b/test/ruby/test_ast.rb
@@ -178,4 +178,32 @@ class TestAst < Test::Unit::TestCase
     assert_equal([:x], lv)
     assert_equal("NODE_LASGN", body.type)
   end
+
+  def test_call
+    node = RubyVM::AST.parse("nil.foo")
+    _, _, body = *node.children
+    assert_equal("NODE_CALL", body.type)
+    recv, mid, args = body.children
+    assert_equal("NODE_NIL", recv.type)
+    assert_equal(:foo, mid)
+    assert_nil(args)
+  end
+
+  def test_fcall
+    node = RubyVM::AST.parse("foo()")
+    _, _, body = *node.children
+    assert_equal("NODE_FCALL", body.type)
+    mid, args = body.children
+    assert_equal(:foo, mid)
+    assert_nil(args)
+  end
+
+  def test_vcall
+    node = RubyVM::AST.parse("foo")
+    _, _, body = *node.children
+    assert_equal("NODE_VCALL", body.type)
+    mid, args = body.children
+    assert_equal(:foo, mid)
+    assert_nil(args)
+  end
 end