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

+added a too many routines error; +added a reference count overflow error.

Browse Source
This commit is contained in:
Wang Renxin 2016-07-19 18:30:53 +08:00 committed by GitHub
parent 568270906a
commit c3f3359621
1 changed files with 31 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
core/my_basic.c
View File

@ -218,7 +218,7 @@ static const char* _ERR_DESC[] = {
"Index out of bound", "Index out of bound",
"Cannot find with given index", "Cannot find with given index",
"Illegal bound", "Illegal bound",
"Too much dimensions", "Too many dimensions",
"Operation failed", "Operation failed",
"Invalid operation usage", "Invalid operation usage",
"Dimension count out of bound", "Dimension count out of bound",
@ -263,6 +263,7 @@ static const char* _ERR_DESC[] = {
"Incomplete routine", "Incomplete routine",
"Routine expected", "Routine expected",
"Duplicate routine", "Duplicate routine",
"To many routines",
"Invalid class", "Invalid class",
"Incomplete class", "Incomplete class",
"Class expected", "Class expected",
@ -279,6 +280,7 @@ static const char* _ERR_DESC[] = {
"Invalid iterator", "Invalid iterator",
"Empty collection", "Empty collection",
"Referenced type expected", "Referenced type expected",
"Reference count overflow",
"Debug identifier not found", "Debug identifier not found",
"Stack trace disabled", "Stack trace disabled",
/** Extended abort */ /** Extended abort */
@ -1680,7 +1682,7 @@ static _class_t* _reflect_string_to_class(mb_interpreter_t* s, const char* n, mb
static bool_t _is_valid_class_accessor_following_routine(mb_interpreter_t* s, _var_t* var, _ls_node_t* ast, _ls_node_t** out); static bool_t _is_valid_class_accessor_following_routine(mb_interpreter_t* s, _var_t* var, _ls_node_t* ast, _ls_node_t** out);
#endif /* MB_ENABLE_CLASS */ #endif /* MB_ENABLE_CLASS */
static void _init_routine(mb_interpreter_t* s, _routine_t* routine, char* n, mb_routine_func_t f); static void _init_routine(mb_interpreter_t* s, _routine_t* routine, char* n, mb_routine_func_t f);
static void _begin_routine(mb_interpreter_t* s); static int _begin_routine(mb_interpreter_t* s);
static bool_t _end_routine(mb_interpreter_t* s); static bool_t _end_routine(mb_interpreter_t* s);
static void _begin_routine_parameter_list(mb_interpreter_t* s); static void _begin_routine_parameter_list(mb_interpreter_t* s);
static void _end_routine_parameter_list(mb_interpreter_t* s); static void _end_routine_parameter_list(mb_interpreter_t* s);
@ -5185,15 +5187,19 @@ _end_import:
if(context->last_symbol && !_is_bracket_char(sym[0])) { if(context->last_symbol && !_is_bracket_char(sym[0])) {
glbsyminscope = _search_identifier_in_scope_chain(s, 0, sym, 0, 0, 0); glbsyminscope = _search_identifier_in_scope_chain(s, 0, sym, 0, 0, 0);
if(glbsyminscope && ((_object_t*)glbsyminscope->data)->type == _DT_ROUTINE) { if(glbsyminscope && ((_object_t*)glbsyminscope->data)->type == _DT_ROUTINE) {
if(_IS_FUNC(context->last_symbol, _core_def)) if(_IS_FUNC(context->last_symbol, _core_def)) {
_begin_routine(s); if(_begin_routine(s) != MB_FUNC_OK)
goto _exit;
}
result = _DT_ROUTINE; result = _DT_ROUTINE;
goto _exit; goto _exit;
} }
if(_IS_FUNC(context->last_symbol, _core_def) || _IS_FUNC(context->last_symbol, _core_call)) { if(_IS_FUNC(context->last_symbol, _core_def) || _IS_FUNC(context->last_symbol, _core_call)) {
if(_IS_FUNC(context->last_symbol, _core_def)) if(_IS_FUNC(context->last_symbol, _core_def)) {
_begin_routine(s); if(_begin_routine(s) != MB_FUNC_OK)
goto _exit;
}
#ifdef MB_ENABLE_UNICODE_ID #ifdef MB_ENABLE_UNICODE_ID
if(!_is_identifier_char(sym[0]) && !mb_uu_ischar(sym)) { if(!_is_identifier_char(sym[0]) && !mb_uu_ischar(sym)) {
#else /* MB_ENABLE_UNICODE_ID */ #else /* MB_ENABLE_UNICODE_ID */
@ -5724,7 +5730,10 @@ static _ref_count_t _ref(_ref_t* ref, void* data) {
mb_unrefvar(data); mb_unrefvar(data);
++(*ref->count); ++(*ref->count);
mb_assert(*ref->count > before && "Too many referencing, count overflow, please redefine _ref_count_t."); if(before > *ref->count) {
mb_assert(0 && "Too many referencing, count overflow, please redefine _ref_count_t.");
_handle_error_now(ref->s, SE_RN_REFERENCE_COUNT_OVERFLOW, ref->s->last_error_file, MB_FUNC_ERR);
}
return *ref->count; return *ref->count;
} }
@ -7829,13 +7838,22 @@ static void _init_routine(mb_interpreter_t* s, _routine_t* routine, char* n, mb_
} }
/* Begin parsing a routine */ /* Begin parsing a routine */
static void _begin_routine(mb_interpreter_t* s) { static int _begin_routine(mb_interpreter_t* s) {
int result = MB_FUNC_OK;
_parsing_context_t* context = 0; _parsing_context_t* context = 0;
unsigned short before = 0;
mb_assert(s); mb_assert(s);
context = s->parsing_context; context = s->parsing_context;
context->routine_state++; before = context->routine_state++;
if(before > context->routine_state) {
context->routine_state--;
result = MB_FUNC_ERR;
_handle_error_now(s, SE_RN_TOO_MANY_ROUTINES, s->last_error_file, result);
}
return result;
} }
/* End parsing a routine */ /* End parsing a routine */
@ -11602,7 +11620,7 @@ 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, DON2(l), MB_FUNC_ERR, _exit, result); _handle_error_on_obj(s, SE_RN_TOO_MANY_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];
@ -12320,14 +12338,14 @@ int mb_run(struct mb_interpreter_t* s) {
if(s->parsing_context) { if(s->parsing_context) {
if(s->parsing_context->routine_state) { if(s->parsing_context->routine_state) {
result = MB_FUNC_ERR; result = MB_FUNC_ERR;
_handle_error_now(s, SE_RN_INCOMPLETE_ROUTINE, s->source_file, MB_FUNC_ERR); _handle_error_now(s, SE_RN_INCOMPLETE_ROUTINE, s->source_file, result);
goto _exit; goto _exit;
} }
#ifdef MB_ENABLE_CLASS #ifdef MB_ENABLE_CLASS
if(s->parsing_context->class_state != _CLASS_STATE_NONE) { if(s->parsing_context->class_state != _CLASS_STATE_NONE) {
result = MB_FUNC_ERR; result = MB_FUNC_ERR;
_handle_error_now(s, SE_RN_INCOMPLETE_CLASS, s->source_file, MB_FUNC_ERR); _handle_error_now(s, SE_RN_INCOMPLETE_CLASS, s->source_file, result);
goto _exit; goto _exit;
} }
@ -13497,7 +13515,7 @@ static int _core_dim(mb_interpreter_t* s, void** l) {
_handle_error_on_obj(s, SE_RN_ILLEGAL_BOUND, s->source_file, DON(ast), MB_FUNC_ERR, _exit, result); _handle_error_on_obj(s, SE_RN_ILLEGAL_BOUND, s->source_file, DON(ast), MB_FUNC_ERR, _exit, result);
} }
if(dummy.dimension_count >= MB_MAX_DIMENSION_COUNT) { if(dummy.dimension_count >= MB_MAX_DIMENSION_COUNT) {
_handle_error_on_obj(s, SE_RN_TOO_MUCH_DIMENSIONS, s->source_file, DON(ast), MB_FUNC_ERR, _exit, result); _handle_error_on_obj(s, SE_RN_TOO_MANY_DIMENSIONS, s->source_file, DON(ast), MB_FUNC_ERR, _exit, result);
} }
dummy.dimensions[dummy.dimension_count++] = (int)val.integer; dummy.dimensions[dummy.dimension_count++] = (int)val.integer;
if(dummy.count) if(dummy.count)