CPunch/Cosmo
1
0
Fork 0
mirror of https://github.com/CPunch/Cosmo.git synced 2024-12-04 14:36:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: CPunch:9c5270124d4ebf098d255cdeb94d1ff405a4398d
Branches Tags
CPunch:main
CPunch:error-handling
...
compare: CPunch:1d2ba217afe144c9e2fc67279001f05e69ae4ef6
Branches Tags
CPunch:main
CPunch:error-handling

2 Commits
9c5270124d ... 1d2ba217af

Author SHA1 Message Date
CPunch
1d2ba217af minor refactoring 2023-08-25 23:34:21 -05:00
CPunch
e28ffe1c6c refactored cobj.c:printObject() 
uses obj type strings from cosmoO_typeStr
 2023-08-25 21:28:41 -05:00
3 changed files with 16 additions and 14 deletions
Show Stats Expand all files Collapse all files

4
src/cmem.c
View File

@ -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) {

25
src/cobj.c
View File

@ -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);
}
}

1
src/cvm.c
View File

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