minor refactoring

uses obj type strings from cosmoO_typeStr

src/cmem.c

@@ -10,7 +10,9 @@
 // realloc wrapper
 void *cosmoM_reallocate(CState *state, void *buf, size_t oldSize, size_t newSize)
 {
-    if (buf == NULL) oldSize = 0;
+    if (buf == NULL)
+        oldSize = 0;
+
 #ifdef GC_DEBUG
     printf("old allocated bytes: %ld\n", state->allocatedBytes);
     if (buf) {

src/cobj.c

@@ -188,10 +188,10 @@ CObjObject *cosmoO_newObject(CState *state)
     obj->userP = NULL; // reserved for C API
     obj->userT = 0;
     obj->isLocked = false;
+
     cosmoV_pushRef(state, (CObj *)obj); // so our GC can keep track of it
     cosmoT_initTable(state, &obj->tbl, ARRAY_START);
     cosmoV_pop(state);
-
     return obj;
 }
 
@@ -698,60 +698,61 @@ int cosmoO_count(CState *state, CObj *obj)
 
 void printObject(CObj *o)
 {
+    printf("%s ", cosmoO_typeStr(o));
     switch (o->type) {
     case COBJ_STRING: {
         CObjString *objStr = (CObjString *)o;
-        printf("<string> \"%.*s\"", objStr->length, objStr->str);
+        printf("\"%.*s\"", objStr->length, objStr->str);
         break;
     }
     case COBJ_OBJECT: {
-        printf("<obj> %p", (void *)o);
+        printf("%p", (void *)o);
         break;
     }
     case COBJ_TABLE: {
         CObjTable *tbl = (CObjTable *)o;
-        printf("<tbl> %p", (void *)tbl);
+        printf("%p", (void *)tbl);
         break;
     }
     case COBJ_FUNCTION: {
         CObjFunction *objFunc = (CObjFunction *)o;
         if (objFunc->name != NULL)
-            printf("<function> %.*s", objFunc->name->length, objFunc->name->str);
+            printf("%.*s", objFunc->name->length, objFunc->name->str);
         else
-            printf("<function> %s", UNNAMEDCHUNK);
+            printf("%s", UNNAMEDCHUNK);
         break;
     }
     case COBJ_CFUNCTION: {
         CObjCFunction *objCFunc = (CObjCFunction *)o;
-        printf("<c function> %p", (void *)objCFunc->cfunc);
+        printf("%p", (void *)objCFunc->cfunc);
         break;
     }
     case COBJ_ERROR: {
         CObjError *err = (CObjError *)o;
-        printf("<error> %p -> ", (void *)o);
+        printf("%p -> ", (void *)o);
         printValue(err->err);
         break;
     }
     case COBJ_METHOD: {
         CObjMethod *method = (CObjMethod *)o;
-        printf("<method> %p -> ", (void *)method);
+        printf("%p -> ", (void *)method);
         printValue(method->func);
         break;
     }
     case COBJ_CLOSURE: {
         CObjClosure *closure = (CObjClosure *)o;
-        printf("<closure> %p -> ", (void *)closure);
+        printf("%p -> ", (void *)closure);
         printObject((CObj *)closure->function); // just print the function
         break;
     }
     case COBJ_UPVALUE: {
         CObjUpval *upval = (CObjUpval *)o;
-        printf("<upvalue> %p -> ", (void *)upval->val);
+        printf("%p -> ", (void *)upval->val);
         printValue(*upval->val);
         break;
     }
     default:
-        printf("<unkn obj %p>", (void *)o);
+        printf("%p", (void *)o);
     }
 }
 

src/cvm.c

@@ -764,7 +764,6 @@ int cosmoV_execute(CState *state)
             {
                 uint8_t indx = READBYTE(frame);
                 cosmoV_pushValue(state, frame->base[indx]);
-                continue;
             }
             CASE(OP_GETUPVAL) :
             {