Core: centralize TaggedValue class resolution; use value.getClass() in interpreter and primitives; fix pointer classification (Strings vs objects).

Author: KentBeck

src/cpp/src/interpreter.cpp

@@ -607,21 +607,11 @@ TaggedValue Interpreter::sendMessage(TaggedValue receiver,
 }
 
 Class *Interpreter::getObjectClass(TaggedValue value) {
-  if (value.isSmallInteger()) {
-    return ClassUtils::getIntegerClass();
+  Class *cls = value.getClass();
+  if (!cls) {
+    throw std::runtime_error("Unknown value type");
   }
-  if (value.isBoolean()) {
-    return value.getBoolean() ? ClassUtils::getTrueClass()
-                              : ClassUtils::getFalseClass();
-  }
-  if (value.isNil()) {
-    return ClassRegistry::getInstance().getClass("UndefinedObject");
-  }
-  if (value.isPointer()) {
-    return value.asObject()->getClass();
-  }
-
-  throw std::runtime_error("Unknown value type");
+  return cls;
 }
 
 // Temporarily removed - will implement proper message send parsing later

src/cpp/src/primitives/object.cpp

@@ -148,27 +148,8 @@ TaggedValue primitive_class(TaggedValue receiver,
   // Check argument count
   Primitives::checkArgumentCount(args, 0, "class");
 
-  Class *receiverClass = nullptr;
-
-  // Handle immediate values
-  if (receiver.isSmallInteger()) {
-    receiverClass = ClassUtils::getIntegerClass();
-  } else if (receiver.isBoolean()) {
-    receiverClass = receiver.getBoolean() ? ClassUtils::getTrueClass()
-                                          : ClassUtils::getFalseClass();
-  } else if (receiver.isNil()) {
-    // UndefinedObject class for nil
-    receiverClass = ClassRegistry::getInstance().getClass("UndefinedObject");
-    if (receiverClass == nullptr) {
-      throw PrimitiveFailure("UndefinedObject class not found");
-    }
-  } else if (receiver.isPointer()) {
-    Object *obj = receiver.asObject();
-    receiverClass = obj->getClass();
-    if (receiverClass == nullptr) {
-      throw PrimitiveFailure("Object has no class");
-    }
-  } else {
+  Class *receiverClass = receiver.getClass();
+  if (receiverClass == nullptr) {
     throw PrimitiveFailure("Unknown receiver type");
   }
 

src/cpp/src/tagged_value.cpp

@@ -32,21 +32,15 @@ Class *TaggedValue::getClass() const {
     return ClassUtils::getObjectClass();
   } else if (isPointer()) {
     try {
-      // Try as Symbol first
-      asSymbol(); // Just check if it's a symbol
-      return ClassUtils::getSymbolClass();
-    } catch (...) {
-      try {
-        // Try as String
-        Object *obj = asObject();
-        if (StringUtils::isString(*this)) {
-          return ClassUtils::getStringClass();
-        }
-        // Try as generic Object
-        return obj->getClass();
-      } catch (...) {
-        return nullptr;
+      // Strings are byte-indexable and detected via utility
+      if (StringUtils::isString(*this)) {
+        return ClassUtils::getStringClass();
       }
+      // Otherwise use the object's class directly
+      Object *obj = asObject();
+      return obj ? obj->getClass() : nullptr;
+    } catch (...) {
+      return nullptr;
     }
   }
   return nullptr;