quinn-os/my-basic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*improved error handling.

Browse Source
This commit is contained in:
Wang Renxin 2016-07-05 12:40:01 +08:00 committed by GitHub
parent 54d29eb513
commit c5944e67b9
1 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
core/my_basic.c
View File

@ -221,7 +221,8 @@ static const char* _ERR_DESC[] = {
"Operation failed", "Operation failed",
"Invalid operation usage", "Invalid operation usage",
"Dimension count out of bound", "Dimension count out of bound",
"Out of bound", "Rank out of bound",
"Complex array required",
"Label does not exist", "Label does not exist",
"No return point", "No return point",
"Colon expected", "Colon expected",
@ -253,6 +254,7 @@ static const char* _ERR_DESC[] = {
"MOD by zero", "MOD by zero",
"Invalid expression", "Invalid expression",
"Out of memory", "Out of memory",
"Module not match",
"Wrong function reached", "Wrong function reached",
"Do not suspend in a routine", "Do not suspend in a routine",
"Do not mix instructional and structured sub routines", "Do not mix instructional and structured sub routines",
@ -275,6 +277,7 @@ static const char* _ERR_DESC[] = {
"Invalid iterator", "Invalid iterator",
"Empty collection", "Empty collection",
"Referenced type expected", "Referenced type expected",
"Debug identifier not found",
"Stack trace disabled", "Stack trace disabled",
/** Extended abort */ /** Extended abort */
"Extended abort" "Extended abort"
@ -6416,7 +6419,7 @@ static int _get_array_index(mb_interpreter_t* s, _ls_node_t** l, _object_t* c, u
_handle_error_on_obj(s, SE_RN_DIMENSION_COUNT_OUT_OF_BOUND, s->source_file, DON(ast), MB_FUNC_ERR, _exit, result); _handle_error_on_obj(s, SE_RN_DIMENSION_COUNT_OUT_OF_BOUND, s->source_file, DON(ast), MB_FUNC_ERR, _exit, result);
} }
if((int)val.integer >= arr->data.array->dimensions[dcount]) { if((int)val.integer >= arr->data.array->dimensions[dcount]) {
_handle_error_on_obj(s, SE_RN_ARRAY_OUT_OF_BOUND, s->source_file, DON(ast), MB_FUNC_ERR, _exit, result); _handle_error_on_obj(s, SE_RN_INDEX_OUT_OF_BOUND, s->source_file, DON(ast), MB_FUNC_ERR, _exit, result);
} }
idx += (unsigned int)val.integer * f; idx += (unsigned int)val.integer * f;
/* Comma? */ /* Comma? */
@ -6428,7 +6431,7 @@ static int _get_array_index(mb_interpreter_t* s, _ls_node_t** l, _object_t* c, u
} }
*index = idx; *index = idx;
if(!arr->data.array->raw) { if(!arr->data.array->raw) {
_handle_error_on_obj(s, SE_RN_ARRAY_OUT_OF_BOUND, s->source_file, DON(ast), MB_FUNC_ERR, _exit, result); _handle_error_on_obj(s, SE_RN_RANK_OUT_OF_BOUND, s->source_file, DON(ast), MB_FUNC_ERR, _exit, result);
} }
_exit: _exit:
@ -10820,13 +10823,16 @@ int mb_begin_module(struct mb_interpreter_t* s, const char* n) {
mb_assert(s && n); mb_assert(s && n);
#ifdef MB_ENABLE_MODULE #ifdef MB_ENABLE_MODULE
if(s->with_module) {
_handle_error_on_obj(s, SE_RN_MODULE_NOT_MATCH, s->source_file, (_object_t*)0, MB_FUNC_ERR, _exit, result);
} else {
s->with_module = mb_strdup(n, strlen(n) + 1); s->with_module = mb_strdup(n, strlen(n) + 1);
}
#else /* MB_ENABLE_MODULE */ #else /* MB_ENABLE_MODULE */
_handle_error_on_obj(s, SE_RN_NOT_SUPPORTED, s->source_file, (_object_t*)0, MB_FUNC_WARNING, _exit, result); _handle_error_on_obj(s, SE_RN_NOT_SUPPORTED, s->source_file, (_object_t*)0, MB_FUNC_WARNING, _exit, result);
_exit:
#endif /* MB_ENABLE_MODULE */ #endif /* MB_ENABLE_MODULE */
_exit:
return result; return result;
} }
@ -10839,14 +10845,15 @@ int mb_end_module(struct mb_interpreter_t* s) {
#ifdef MB_ENABLE_MODULE #ifdef MB_ENABLE_MODULE
if(s->with_module) { if(s->with_module) {
safe_free(s->with_module); safe_free(s->with_module);
} else {
_handle_error_on_obj(s, SE_RN_MODULE_NOT_MATCH, s->source_file, (_object_t*)0, MB_FUNC_ERR, _exit, result);
} }
#else /* MB_ENABLE_MODULE */ #else /* MB_ENABLE_MODULE */
_handle_error_on_obj(s, SE_RN_NOT_SUPPORTED, s->source_file, (_object_t*)0, MB_FUNC_WARNING, _exit, result); _handle_error_on_obj(s, SE_RN_NOT_SUPPORTED, s->source_file, (_object_t*)0, MB_FUNC_WARNING, _exit, result);
_exit:
#endif /* MB_ENABLE_MODULE */ #endif /* MB_ENABLE_MODULE */
_exit:
return result; return result;
} }
@ -11472,12 +11479,12 @@ int mb_init_array(struct mb_interpreter_t* s, void** l, mb_data_e t, int* d, int
*a = 0; *a = 0;
if(c >= MB_MAX_DIMENSION_COUNT) { if(c >= MB_MAX_DIMENSION_COUNT) {
_handle_error_on_obj(s, SE_RN_TOO_MUCH_DIMENSIONS, s->source_file, TON(l), MB_FUNC_ERR, _exit, result); _handle_error_on_obj(s, SE_RN_TOO_MUCH_DIMENSIONS, s->source_file, DON2(l), MB_FUNC_ERR, _exit, result);
} }
for(j = 0; j < c; j++) { for(j = 0; j < c; j++) {
n = d[j]; n = d[j];
if(n <= 0) { if(n <= 0) {
_handle_error_on_obj(s, SE_RN_ILLEGAL_BOUND, s->source_file, TON(l), MB_FUNC_ERR, _exit, result); _handle_error_on_obj(s, SE_RN_ILLEGAL_BOUND, s->source_file, DON2(l), MB_FUNC_ERR, _exit, result);
} }
} }
@ -11487,9 +11494,7 @@ int mb_init_array(struct mb_interpreter_t* s, void** l, mb_data_e t, int* d, int
} else if(t == MB_DT_STRING) { } else if(t == MB_DT_STRING) {
type = _DT_STRING; type = _DT_STRING;
} else { } else {
result = MB_NEED_COMPLEX_ARRAY; _handle_error_on_obj(s, SE_RN_NEED_COMPLEX_ARRAY, s->source_file, DON2(l), MB_FUNC_ERR, _exit, result);
goto _exit;
} }
#else /* MB_SIMPLE_ARRAY */ #else /* MB_SIMPLE_ARRAY */
type = _DT_REAL; type = _DT_REAL;
@ -11525,9 +11530,7 @@ int mb_get_array_len(struct mb_interpreter_t* s, void** l, void* a, int r, int*
arr = (_array_t*)a; arr = (_array_t*)a;
if(r < 0 || r >= arr->dimension_count) { if(r < 0 || r >= arr->dimension_count) {
result = MB_RANK_OUT_OF_BOUNDS; _handle_error_on_obj(s, SE_RN_RANK_OUT_OF_BOUND, s->source_file, DON2(l), MB_FUNC_ERR, _exit, result);
goto _exit;
} }
if(i) if(i)
*i = arr->dimensions[r]; *i = arr->dimensions[r];
@ -11547,18 +11550,14 @@ int mb_get_array_elem(struct mb_interpreter_t* s, void** l, void* a, int* d, int
arr = (_array_t*)a; arr = (_array_t*)a;
if(c < 0 || c > arr->dimension_count) { if(c < 0 || c > arr->dimension_count) {
result = MB_RANK_OUT_OF_BOUNDS; _handle_error_on_obj(s, SE_RN_DIMENSION_COUNT_OUT_OF_BOUND, s->source_file, DON2(l), MB_FUNC_ERR, _exit, result);
goto _exit;
} }
if(!val) if(!val)
goto _exit; goto _exit;
index = _get_array_pos(s, arr, d, c); index = _get_array_pos(s, arr, d, c);
if(index < 0) { if(index < 0) {
result = MB_INDEX_OUT_OF_BOUNDS; _handle_error_on_obj(s, SE_RN_INDEX_OUT_OF_BOUND, s->source_file, DON2(l), MB_FUNC_ERR, _exit, result);
goto _exit;
} }
_get_array_elem(s, arr, index, &val->value, &type); _get_array_elem(s, arr, index, &val->value, &type);
@ -11579,16 +11578,12 @@ int mb_set_array_elem(struct mb_interpreter_t* s, void** l, void* a, int* d, int
arr = (_array_t*)a; arr = (_array_t*)a;
if(c < 0 || c > arr->dimension_count) { if(c < 0 || c > arr->dimension_count) {
result = MB_RANK_OUT_OF_BOUNDS; _handle_error_on_obj(s, SE_RN_DIMENSION_COUNT_OUT_OF_BOUND, s->source_file, DON2(l), MB_FUNC_ERR, _exit, result);
goto _exit;
} }
index = _get_array_pos(s, arr, d, c); index = _get_array_pos(s, arr, d, c);
if(index < 0) { if(index < 0) {
result = MB_INDEX_OUT_OF_BOUNDS; _handle_error_on_obj(s, SE_RN_INDEX_OUT_OF_BOUND, s->source_file, DON2(l), MB_FUNC_ERR, _exit, result);
goto _exit;
} }
type = _public_type_to_internal_type(val.type); type = _public_type_to_internal_type(val.type);
@ -12305,9 +12300,10 @@ int mb_debug_get(struct mb_interpreter_t* s, const char* n, mb_value_t* val) {
if(val) { if(val) {
mb_make_nil(*val); mb_make_nil(*val);
} }
result = MB_DEBUG_ID_NOT_FOUND; _handle_error_on_obj(s, SE_RN_DEBUG_ID_NOT_FOUND, s->source_file, (_object_t*)0, MB_FUNC_ERR, _exit, result);
} }
_exit:
return result; return result;
} }
@ -12328,9 +12324,10 @@ int mb_debug_set(struct mb_interpreter_t* s, const char* n, mb_value_t val) {
mb_assert(obj->type == _DT_VAR); mb_assert(obj->type == _DT_VAR);
result = _public_value_to_internal_object(&val, obj->data.variable->data); result = _public_value_to_internal_object(&val, obj->data.variable->data);
} else { } else {
result = MB_DEBUG_ID_NOT_FOUND; _handle_error_on_obj(s, SE_RN_DEBUG_ID_NOT_FOUND, s->source_file, (_object_t*)0, MB_FUNC_ERR, _exit, result);
} }
_exit:
return result; return result;
} }
@ -15171,7 +15168,7 @@ static int _std_asc(mb_interpreter_t* s, void** l) {
sz = (size_t)mb_uu_ischar(arg); sz = (size_t)mb_uu_ischar(arg);
if(sizeof(int_t) < sz) { if(sizeof(int_t) < sz) {
sz = sizeof(int_t); sz = sizeof(int_t);
_handle_error_on_obj(s, SE_RN_NUMBER_OVERFLOW, s->source_file, TON(l), MB_FUNC_WARNING, _exit, result); _handle_error_on_obj(s, SE_RN_NUMBER_OVERFLOW, s->source_file, DON2(l), MB_FUNC_WARNING, _exit, result);
} }
memcpy(&val, arg, sz); memcpy(&val, arg, sz);
#else /* MB_ENABLE_UNICODE */ #else /* MB_ENABLE_UNICODE */