CPunch/Cosmo
1
0
Fork 0
mirror of https://github.com/CPunch/Cosmo.git synced 2025-10-30 20:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

added cosmoV_error

Browse Source
This commit is contained in:
CPunch
2020-11-13 12:54:06 -06:00
parent 08b6dcbf4c
commit 71d3a8e1c4
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/cbaselib.c
View File

@@ -26,11 +26,17 @@ CValue cosmoB_dsetMeta(CState *state, int nargs, CValue *args) {
CObjObject *meta = cosmoV_readObject(args[1]); CObjObject *meta = cosmoV_readObject(args[1]);
obj->meta = meta; // boom done obj->meta = meta; // boom done
} } else {
cosmoV_error(state, "Expected 2 parameters, got %d!", nargs);
}
return cosmoV_newNil(); // nothing return cosmoV_newNil(); // nothing
} }
CValue cosmoB_dgetMeta(CState *state, int nargs, CValue *args) { CValue cosmoB_dgetMeta(CState *state, int nargs, CValue *args) {
if (nargs != 1) {
cosmoV_error(state, "Expected 1 parameter, got %d!", nargs);
}
return cosmoV_newObj(cosmoV_readObject(args[0])->meta); // just return the meta return cosmoV_newObj(cosmoV_readObject(args[0])->meta); // just return the meta
} }

20
src/cvm.c
View File

@@ -6,7 +6,7 @@
#include <stdarg.h> #include <stdarg.h>
#include <string.h> #include <string.h>
void runtimeError(CState *state, const char *format, ...) { void cosmoV_error(CState *state, const char *format, ...) {
if (state->panic) if (state->panic)
return; return;
@@ -115,7 +115,7 @@ typedef enum {
bool call(CState *state, CObjClosure *closure, int args) { bool call(CState *state, CObjClosure *closure, int args) {
// missmatched args, thats an obvious user error, so error. // missmatched args, thats an obvious user error, so error.
if (args != closure->function->args) { if (args != closure->function->args) {
runtimeError(state, "Expected %d parameters for %s, got %d!", closure->function->args, closure->function->name == NULL ? UNNAMEDCHUNK : closure->function->name->str, args); cosmoV_error(state, "Expected %d parameters for %s, got %d!", closure->function->args, closure->function->name == NULL ? UNNAMEDCHUNK : closure->function->name->str, args);
return false; return false;
} }
@@ -153,7 +153,7 @@ bool callMethod(CState* state, CObjMethod *method, int args) {
StkPtr val = state->top - args - 1; StkPtr val = state->top - args - 1;
if (args+1 != closure->function->args) { if (args+1 != closure->function->args) {
runtimeError(state, "Expected %d parameters for %s, got %d!", closure->function->args, closure->function->name == NULL ? UNNAMEDCHUNK : closure->function->name->str, args+1); cosmoV_error(state, "Expected %d parameters for %s, got %d!", closure->function->args, closure->function->name == NULL ? UNNAMEDCHUNK : closure->function->name->str, args+1);
return false; return false;
} }
@@ -179,7 +179,7 @@ COSMOVMRESULT cosmoV_call(CState *state, int args) {
StkPtr val = cosmoV_getTop(state, args); // function will always be right above the args StkPtr val = cosmoV_getTop(state, args); // function will always be right above the args
if (!(val->type == COSMO_TOBJ)) { if (!(val->type == COSMO_TOBJ)) {
runtimeError(state, "Cannot call non-function value!"); cosmoV_error(state, "Cannot call non-function value!");
return COSMOVM_RUNTIME_ERR; return COSMOVM_RUNTIME_ERR;
} }
@@ -211,7 +211,7 @@ COSMOVMRESULT cosmoV_call(CState *state, int args) {
} else { } else {
// no default initalizer // no default initalizer
if (args != 0) { if (args != 0) {
runtimeError(state, "Expected 0 parameters, got %d!", args); cosmoV_error(state, "Expected 0 parameters, got %d!", args);
return COSMOVM_RUNTIME_ERR; return COSMOVM_RUNTIME_ERR;
} }
state->top--; state->top--;
@@ -234,7 +234,7 @@ COSMOVMRESULT cosmoV_call(CState *state, int args) {
break; break;
} }
default: default:
runtimeError(state, "Cannot call non-function value!"); cosmoV_error(state, "Cannot call non-function value!");
return COSMOVM_RUNTIME_ERR; return COSMOVM_RUNTIME_ERR;
} }
@@ -289,7 +289,7 @@ COSMO_API bool cosmoV_getObject(CState *state, CObjObject *object, CValue key, C
cosmoV_setTop(state, 2); /* pop the 2 values */ \ cosmoV_setTop(state, 2); /* pop the 2 values */ \
cosmoV_pushValue(state, typeConst((valA->val.num) op (valB->val.num))); \ cosmoV_pushValue(state, typeConst((valA->val.num) op (valB->val.num))); \
} else { \ } else { \
runtimeError(state, "Expected number!"); \ cosmoV_error(state, "Expected number!"); \
} \ } \
// returns false if panic // returns false if panic
@@ -416,7 +416,7 @@ bool cosmoV_execute(CState *state) {
// sanity check // sanity check
if (!(temp->type == COSMO_TOBJ) || !(temp->val.obj->type == COBJ_OBJECT)) { if (!(temp->type == COSMO_TOBJ) || !(temp->val.obj->type == COBJ_OBJECT)) {
runtimeError(state, "Couldn't get from non-object!"); cosmoV_error(state, "Couldn't get from non-object!");
break; break;
} }
@@ -435,7 +435,7 @@ bool cosmoV_execute(CState *state) {
// sanity check // sanity check
if (!(temp->type == COSMO_TOBJ) || !(temp->val.obj->type == COBJ_OBJECT)) { if (!(temp->type == COSMO_TOBJ) || !(temp->val.obj->type == COBJ_OBJECT)) {
runtimeError(state, "Couldn't set a field on a non-object!"); cosmoV_error(state, "Couldn't set a field on a non-object!");
break; break;
} }
@@ -473,7 +473,7 @@ bool cosmoV_execute(CState *state) {
cosmoV_pop(state); cosmoV_pop(state);
cosmoV_pushValue(state, cosmoV_newNumber(-(val->val.num))); cosmoV_pushValue(state, cosmoV_newNumber(-(val->val.num)));
} else { } else {
runtimeError(state, "Expected number!"); cosmoV_error(state, "Expected number!");
} }
break; break;
} }

1
src/cvm.h
View File

@@ -16,6 +16,7 @@ typedef enum {
COSMO_API COSMOVMRESULT cosmoV_call(CState *state, int args); COSMO_API COSMOVMRESULT cosmoV_call(CState *state, int args);
COSMO_API void cosmoV_pushObject(CState *state, int pairs); COSMO_API void cosmoV_pushObject(CState *state, int pairs);
COSMO_API bool cosmoV_getObject(CState *state, CObjObject *object, CValue key, CValue *val); COSMO_API bool cosmoV_getObject(CState *state, CObjObject *object, CValue key, CValue *val);
COSMO_API void cosmoV_error(CState *state, const char *format, ...);
// nice to have wrappers // nice to have wrappers