Add global symbol for to_ary

rubinius · Feb 5, 2013 · 0bd52d7 · 0bd52d7
1 parent 761cafc
commit 0bd52d7
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 28 deletions.
diff --git a/vm/builtin/array.cpp b/vm/builtin/array.cpp
@@ -101,8 +101,8 @@ namespace rubinius {
   Array* Array::to_ary(STATE, Object* value, CallFrame* call_frame) {
     if(Tuple* tup = try_as<Tuple>(value)) {
       return Array::from_tuple(state, tup);
-    } else if(CBOOL(value->respond_to(state, state->symbol("to_ary"), cTrue))) {
-      Arguments args(state->symbol("to_ary"), value, 0, 0);
+    } else if(CBOOL(value->respond_to(state, G(sym_to_ary), cTrue))) {
+      Arguments args(G(sym_to_ary), value, 0, 0);
       Dispatch dis(args.name());
 
       Object* res = dis.send(state, call_frame, args);

diff --git a/vm/builtin/block_environment.cpp b/vm/builtin/block_environment.cpp
@@ -126,8 +126,8 @@ namespace rubinius {
           Array* ary = 0;
 
           if(!(ary = try_as<Array>(obj))) {
-            if(CBOOL(obj->respond_to(state, state->symbol("to_ary"), cFalse))) {
-              obj = obj->send(state, call_frame, state->symbol("to_ary"));
+            if(CBOOL(obj->respond_to(state, G(sym_to_ary), cFalse))) {
+              obj = obj->send(state, call_frame, G(sym_to_ary));
               if(!(ary = try_as<Array>(obj))) {
                 Exception::type_error(state, "to_ary must return an Array", call_frame);
                 return false;

diff --git a/vm/builtin/proc.cpp b/vm/builtin/proc.cpp
@@ -76,8 +76,8 @@ namespace rubinius {
             Object* obj = args.get_argument(0);
 
             if(!(ary = try_as<Array>(obj))) {
-              if(CBOOL(obj->respond_to(state, state->symbol("to_ary"), cFalse))) {
-                obj = obj->send(state, call_frame, state->symbol("to_ary"));
+              if(CBOOL(obj->respond_to(state, G(sym_to_ary), cFalse))) {
+                obj = obj->send(state, call_frame, G(sym_to_ary));
                 if(!(ary = try_as<Array>(obj))) {
                   Exception::type_error(state, "to_ary must return an Array", call_frame);
                   return 0;

diff --git a/vm/builtin/system.cpp b/vm/builtin/system.cpp
@@ -1200,9 +1200,9 @@ namespace rubinius {
   Object* System::vm_method_missing_reason(STATE) {
     switch(state->vm()->method_missing_reason()) {
     case ePrivate:
-      return state->symbol("private");
+      return G(sym_private);
     case eProtected:
-      return state->symbol("protected");
+      return G(sym_protected);
     case eSuper:
       return state->symbol("super");
     case eVCall:

diff --git a/vm/capi/capi.cpp b/vm/capi/capi.cpp
@@ -688,15 +688,15 @@ extern "C" {
 
     switch(kind) {
     case cCApiPrivateMethod:
-      visibility = state->symbol("private");
+      visibility = G(sym_private);
       break;
 
     case cCApiProtectedMethod:
-      visibility = state->symbol("protected");
+      visibility = G(sym_protected);
       break;
 
     default:  /* Also catches singletons for now. @todo Verify OK. --rue */
-      visibility = state->symbol("public");
+      visibility = G(sym_public);
       break;
     }
 

diff --git a/vm/globals.hpp b/vm/globals.hpp
@@ -62,7 +62,7 @@ namespace rubinius {
     TypedRoot<Symbol*> sym_from_literal, sym_method_added, sym_s_method_added, sym_init_copy;
     TypedRoot<Symbol*> sym_plus, sym_minus, sym_equal, sym_nequal, sym_tequal, sym_lt, sym_gt;
     TypedRoot<Symbol*> sym_initialize;
-    TypedRoot<Symbol*> sym_coerce_to_array;
+    TypedRoot<Symbol*> sym_coerce_to_array, sym_to_ary;
     TypedRoot<Symbol*> sym_allocation_site;
 
     TypedRoot<Class*> exception;
@@ -172,6 +172,7 @@ namespace rubinius {
       sym_gt(&roots),
       sym_initialize(&roots),
       sym_coerce_to_array(&roots),
+      sym_to_ary(&roots),
       sym_allocation_site(&roots),
       exception(&roots),
       exc_arg(&roots),

diff --git a/vm/instructions.def b/vm/instructions.def
@@ -1246,8 +1246,8 @@ instruction cast_for_multi_block_arg() [ -- array ]
     Object* obj = call_frame->arguments->get_argument(0);
     if(kind_of<Array>(obj)) {
       stack_push(obj);
-    } else if(CBOOL(obj->respond_to(state, state->symbol("to_ary"), cFalse))) {
-      obj = obj->send(state, call_frame, state->symbol("to_ary"));
+    } else if(CBOOL(obj->respond_to(state, G(sym_to_ary), cFalse))) {
+      obj = obj->send(state, call_frame, G(sym_to_ary));
       if(kind_of<Array>(obj)) {
         stack_push(obj);
       } else {
@@ -1288,9 +1288,9 @@ instruction cast_for_splat_block_arg() [ -- arguments ]
        * to be called and its return value ignored. Ultimately, the original
        * object itself is wrapped in an Array and passed to the block.
        */
-      if(CBOOL(obj->respond_to(state, state->symbol("to_ary"), cFalse))) {
+      if(CBOOL(obj->respond_to(state, G(sym_to_ary), cFalse))) {
         OnStack<1> os(state, obj);
-        Object* ignored = obj->send(state, call_frame, state->symbol("to_ary"));
+        Object* ignored = obj->send(state, call_frame, G(sym_to_ary));
         if(!ignored->nil_p() && !kind_of<Array>(ignored)) {
           Exception::type_error(state, "to_ary must return an Array", call_frame);
           RUN_EXCEPTION();

diff --git a/vm/llvm/jit_util.cpp b/vm/llvm/jit_util.cpp
@@ -348,8 +348,8 @@ extern "C" {
       Object* obj = args.get_argument(0);
       if(Array* ary = try_as<Array>(obj)) {
         args.use_array(ary);
-      } else if(CBOOL(obj->respond_to(state, state->symbol("to_ary"), cFalse))) {
-        obj = obj->send(state, call_frame, state->symbol("to_ary"));
+      } else if(CBOOL(obj->respond_to(state, G(sym_to_ary), cFalse))) {
+        obj = obj->send(state, call_frame, G(sym_to_ary));
         if(Array* ary2 = try_as<Array>(obj)) {
           args.use_array(ary2);
         } else {
@@ -367,8 +367,8 @@ extern "C" {
   {
     Array* ary = try_as<Array>(obj);
 
-    if(!ary && CBOOL(obj->respond_to(state, state->symbol("to_ary"), cFalse))) {
-      obj = obj->send(state, call_frame, state->symbol("to_ary"));
+    if(!ary && CBOOL(obj->respond_to(state, G(sym_to_ary), cFalse))) {
+      obj = obj->send(state, call_frame, G(sym_to_ary));
       if(Array* ary2 = try_as<Array>(obj)) {
         ary = ary2;
       } else {
@@ -421,9 +421,9 @@ extern "C" {
          * to be called and its return value ignored. Ultimately, the original
          * object itself is wrapped in an Array and passed to the block.
          */
-        if(CBOOL(obj->respond_to(state, state->symbol("to_ary"), cFalse))) {
+        if(CBOOL(obj->respond_to(state, G(sym_to_ary), cFalse))) {
           OnStack<1> os(state, obj);
-          Object* ignored = obj->send(state, call_frame, state->symbol("to_ary"));
+          Object* ignored = obj->send(state, call_frame, G(sym_to_ary));
           if(!ignored->nil_p() && !kind_of<Array>(ignored)) {
             Exception::type_error(state, "to_ary must return an Array", call_frame);
             return 0;
@@ -450,8 +450,8 @@ extern "C" {
       Object* obj = args.get_argument(0);
       if(kind_of<Array>(obj)) {
         return obj;
-      } else if(CBOOL(obj->respond_to(state, state->symbol("to_ary"), cFalse))) {
-        obj = obj->send(state, call_frame, state->symbol("to_ary"));
+      } else if(CBOOL(obj->respond_to(state, G(sym_to_ary), cFalse))) {
+        obj = obj->send(state, call_frame, G(sym_to_ary));
         if(kind_of<Array>(obj)) {
           return obj;
         } else {
@@ -493,9 +493,9 @@ extern "C" {
          * to be called and its return value ignored. Ultimately, the original
          * object itself is wrapped in an Array and passed to the block.
          */
-        if(CBOOL(obj->respond_to(state, state->symbol("to_ary"), cFalse))) {
+        if(CBOOL(obj->respond_to(state, G(sym_to_ary), cFalse))) {
           OnStack<1> os(state, obj);
-          Object* ignored = obj->send(state, call_frame, state->symbol("to_ary"));
+          Object* ignored = obj->send(state, call_frame, G(sym_to_ary));
           if(!kind_of<Array>(ignored)) {
             Exception::type_error(state, "to_ary must return an Array", call_frame);
             obj = 0;
@@ -535,8 +535,8 @@ extern "C" {
 
       if(kind_of<Array>(obj)) {
         // Nothing! it's good.
-      } else if(CBOOL(obj->respond_to(state, state->symbol("to_ary"), cFalse))) {
-        obj = obj->send(state, call_frame, state->symbol("to_ary"));
+      } else if(CBOOL(obj->respond_to(state, G(sym_to_ary), cFalse))) {
+        obj = obj->send(state, call_frame, G(sym_to_ary));
         if(!kind_of<Array>(obj)) {
           Exception::type_error(state, "to_ary must return an Array", call_frame);
           obj = 0;

diff --git a/vm/ontology.cpp b/vm/ontology.cpp
@@ -512,6 +512,7 @@ namespace rubinius {
     add_sym(object_id);
     add_sym(call);
     add_sym(coerce_to_array);
+    add_sym(to_ary);
 #undef add_sym
     GO(sym_s_method_added).set(symbol("singleton_method_added"));
     GO(sym_init_copy).set(symbol("initialize_copy"));