Another round of changes; seems we're consistently referring to 6model objects now.

Author: jnthn

build/Makefile.in

@@ -138,7 +138,7 @@ DYNEXT_TARGET   = $(DYNEXT_DIR)/$(GROUP)$(LOAD_EXT)
 DYNPMC          = $(PMC_DIR)/$(GROUP)$(LOAD_EXT)
 DYNOPS          = $(OPS_DIR)/$(OPS)$(LOAD_EXT)
 
-PMC_SOURCES     = $(PMC_DIR)/stable.pmc $(PMC_DIR)/rakudoobject.pmc \
+PMC_SOURCES     = $(PMC_DIR)/stable.pmc $(PMC_DIR)/sixmodelobject.pmc \
                   $(PMC_DIR)/repr.pmc $(PMC_DIR)/dispatchersub.pmc \
                   $(PMC_DIR)/nqpmultisig.pmc $(PMC_DIR)/nqplexinfo.pmc \
                   $(PMC_DIR)/nqplexpad.pmc $(PMC_DIR)/serializationcontext.pmc 

src/metamodel/multi_dispatch.c

@@ -36,8 +36,8 @@ typedef struct candidate_graph_node {
 /* Special value we set arity to when we have a slurpy. */
 #define SLURPY_ARITY 1 << 30
 
-/* Cached type ID for RakudoObject. */
-static INTVAL ro_id = 0;
+/* Cached type ID for 6model Object. */
+static INTVAL smo_id = 0;
 
 /* Definedness constraints. */
 #define DEFINED_ONLY    1
@@ -256,9 +256,9 @@ PMC *nqp_multi_dispatch(PARROT_INTERP, PMC *dispatcher, PMC *capture) {
     candidate_info** candidates    = sort_candidates(interp, dispatchees);
     candidate_info** cur_candidate = candidates;
 
-    /* Ensure we know what is a Rakudo object and what is not. */
-    if (!ro_id)
-        ro_id = pmc_type(interp, Parrot_str_new(interp, "RakudoObject", 0));
+    /* Ensure we know what is a 6model object and what is not. */
+    if (!smo_id)
+        smo_id = pmc_type(interp, Parrot_str_new(interp, "SixModelObject", 0));
 
     /* Iterate over the candidates and collect best ones; terminate
      * when we see two nulls (may break out earlier). */
@@ -294,7 +294,7 @@ PMC *nqp_multi_dispatch(PARROT_INTERP, PMC *dispatcher, PMC *capture) {
 
         for (i = 0; i < type_check_count; i++) {
             PMC * const param = VTABLE_get_pmc_keyed_int(interp, capture, i);
-            PMC * const param_type = param->vtable->base_type == ro_id ?
+            PMC * const param_type = param->vtable->base_type == smo_id ?
                     STABLE(param)->WHAT : PMCNULL;
             PMC * const type_obj = (*cur_candidate)->types[i];
             INTVAL const definedness = (*cur_candidate)->definednesses[i];
@@ -304,7 +304,7 @@ PMC *nqp_multi_dispatch(PARROT_INTERP, PMC *dispatcher, PMC *capture) {
             }
             if (definedness) {
                 /* Have a constraint on the definedness. */
-                INTVAL defined = param->vtable->base_type == ro_id ?
+                INTVAL defined = param->vtable->base_type == smo_id ?
                         REPR(param)->defined(interp, REPR_PMC(param), param) :
                         VTABLE_defined(interp, param);
                 if (!defined && definedness == DEFINED_ONLY || defined && definedness == UNDEFINED_ONLY) {

src/metamodel/reprs/P6opaque.h

@@ -3,7 +3,7 @@
 
 /* This is how an instance with the P6opaque representation starts. However, what
  * follows on from this depends on the declaration. For object attributes, it will
- * be a pointer size and point to another RakudoObject. For native integers and
+ * be a pointer size and point to another 6model Object. For native integers and
  * numbers, it will be the appropriate sized piece of memory to store them
  * right there in the object. Note that P6opaque does not do packed storage, so
  * an int2 gets as much space as an int. */

src/metamodel/sixmodelobject.c

@@ -24,7 +24,7 @@ PMC * SixModelObject_initialize(PARROT_INTERP) {
     /* Look up and cache some type IDs and strings. */
     stable_id       = pmc_type(interp, Parrot_str_new(interp, "STable", 0));
     repr_id         = pmc_type(interp, Parrot_str_new(interp, "REPR", 0));
-    smo_id          = pmc_type(interp, Parrot_str_new(interp, "RakudoObject", 0));
+    smo_id          = pmc_type(interp, Parrot_str_new(interp, "SixModelObject", 0));
     sc_id           = pmc_type(interp, Parrot_str_new(interp, "SerializationContext", 0));
     find_method_str = Parrot_str_new_constant(interp, "find_method");
     type_check_str  = Parrot_str_new_constant(interp, "type_check");

src/ops/nqp.ops

@@ -46,7 +46,7 @@ inline op nqp_dynop_setup() :base_core {
         /* Look up and cache some type IDs. */
         stable_id = pmc_type(interp, Parrot_str_new(interp, "STable", 0));
         repr_id   = pmc_type(interp, Parrot_str_new(interp, "REPR", 0));
-        smo_id    = pmc_type(interp, Parrot_str_new(interp, "RakudoObject", 0));
+        smo_id    = pmc_type(interp, Parrot_str_new(interp, "SixModelObject", 0));
         disp_id   = pmc_type(interp, Parrot_str_new(interp, "DispatcherSub", 0));
         ms_id     = pmc_type(interp, Parrot_str_new(interp, "NQPMultiSig", 0));
 

src/pmc/rakudoobject.pmc renamed to src/pmc/sixmodelobject.pmc

@@ -24,7 +24,7 @@
 
 #include "../metamodel/sixmodelobject.h"
 
-pmclass RakudoObject manual_attrs dynpmc group nqp {
+pmclass SixModelObject manual_attrs dynpmc group nqp {
     /* ********************************************** *
      * These methods are mapped to 6model primitives. *
      * ********************************************** */