refactored cobj.c:printObject()

uses obj type strings from cosmoO_typeStr
This commit is contained in:
CPunch 2023-08-25 21:28:41 -05:00
parent 9c5270124d
commit e28ffe1c6c

View File

@ -698,60 +698,61 @@ int cosmoO_count(CState *state, CObj *obj)
void printObject(CObj *o) void printObject(CObj *o)
{ {
printf("%s ", cosmoO_typeStr(o));
switch (o->type) { switch (o->type) {
case COBJ_STRING: { case COBJ_STRING: {
CObjString *objStr = (CObjString *)o; CObjString *objStr = (CObjString *)o;
printf("<string> \"%.*s\"", objStr->length, objStr->str); printf("\"%.*s\"", objStr->length, objStr->str);
break; break;
} }
case COBJ_OBJECT: { case COBJ_OBJECT: {
printf("<obj> %p", (void *)o); printf("%p", (void *)o);
break; break;
} }
case COBJ_TABLE: { case COBJ_TABLE: {
CObjTable *tbl = (CObjTable *)o; CObjTable *tbl = (CObjTable *)o;
printf("<tbl> %p", (void *)tbl); printf("%p", (void *)tbl);
break; break;
} }
case COBJ_FUNCTION: { case COBJ_FUNCTION: {
CObjFunction *objFunc = (CObjFunction *)o; CObjFunction *objFunc = (CObjFunction *)o;
if (objFunc->name != NULL) if (objFunc->name != NULL)
printf("<function> %.*s", objFunc->name->length, objFunc->name->str); printf("%.*s", objFunc->name->length, objFunc->name->str);
else else
printf("<function> %s", UNNAMEDCHUNK); printf("%s", UNNAMEDCHUNK);
break; break;
} }
case COBJ_CFUNCTION: { case COBJ_CFUNCTION: {
CObjCFunction *objCFunc = (CObjCFunction *)o; CObjCFunction *objCFunc = (CObjCFunction *)o;
printf("<c function> %p", (void *)objCFunc->cfunc); printf("%p", (void *)objCFunc->cfunc);
break; break;
} }
case COBJ_ERROR: { case COBJ_ERROR: {
CObjError *err = (CObjError *)o; CObjError *err = (CObjError *)o;
printf("<error> %p -> ", (void *)o); printf("%p -> ", (void *)o);
printValue(err->err); printValue(err->err);
break; break;
} }
case COBJ_METHOD: { case COBJ_METHOD: {
CObjMethod *method = (CObjMethod *)o; CObjMethod *method = (CObjMethod *)o;
printf("<method> %p -> ", (void *)method); printf("%p -> ", (void *)method);
printValue(method->func); printValue(method->func);
break; break;
} }
case COBJ_CLOSURE: { case COBJ_CLOSURE: {
CObjClosure *closure = (CObjClosure *)o; CObjClosure *closure = (CObjClosure *)o;
printf("<closure> %p -> ", (void *)closure); printf("%p -> ", (void *)closure);
printObject((CObj *)closure->function); // just print the function printObject((CObj *)closure->function); // just print the function
break; break;
} }
case COBJ_UPVALUE: { case COBJ_UPVALUE: {
CObjUpval *upval = (CObjUpval *)o; CObjUpval *upval = (CObjUpval *)o;
printf("<upvalue> %p -> ", (void *)upval->val); printf("%p -> ", (void *)upval->val);
printValue(*upval->val); printValue(*upval->val);
break; break;
} }
default: default:
printf("<unkn obj %p>", (void *)o); printf("%p", (void *)o);
} }
} }