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

*improved stability for sub routine.

Browse Source
This commit is contained in:
paladin-t 2015-11-30 14:27:10 +08:00
parent 2a4d8d40cb
commit 36834cd008
1 changed files with 25 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
core/my_basic.c
View File

@ -81,7 +81,7 @@ extern "C" {
/** Macros */ /** Macros */
#define _VER_MAJOR 1 #define _VER_MAJOR 1
#define _VER_MINOR 1 #define _VER_MINOR 1
#define _VER_REVISION 100 #define _VER_REVISION 101
#define _VER_SUFFIX #define _VER_SUFFIX
#define _MB_VERSION ((_VER_MAJOR * 0x01000000) + (_VER_MINOR * 0x00010000) + (_VER_REVISION)) #define _MB_VERSION ((_VER_MAJOR * 0x01000000) + (_VER_MINOR * 0x00010000) + (_VER_REVISION))
#define _STRINGIZE(A) _MAKE_STRINGIZE(A) #define _STRINGIZE(A) _MAKE_STRINGIZE(A)
@ -1155,7 +1155,7 @@ static void _begin_class(mb_interpreter_t* s);
static void _end_class(mb_interpreter_t* s); static void _end_class(mb_interpreter_t* s);
static void _init_routine(mb_interpreter_t* s, _routine_t* routine, char* n); static void _init_routine(mb_interpreter_t* s, _routine_t* routine, char* n);
static void _begin_routine(mb_interpreter_t* s); static void _begin_routine(mb_interpreter_t* s);
static void _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);
static void _duplicate_parameter(void* data, void* extra, _running_context_t* running); static void _duplicate_parameter(void* data, void* extra, _running_context_t* running);
@ -3236,6 +3236,11 @@ int _create_symbol(mb_interpreter_t* s, _ls_node_t* l, char* sym, _object_t** ob
#endif /* MB_ENABLE_SOURCE_TRACE */ #endif /* MB_ENABLE_SOURCE_TRACE */
type = _get_symbol_type(s, sym, &value); type = _get_symbol_type(s, sym, &value);
if(s->last_error != SE_NO_ERR) {
result = MB_FUNC_ERR;
goto _exit;
}
(*obj)->type = type; (*obj)->type = type;
switch(type) { switch(type) {
case _DT_NIL: case _DT_NIL:
@ -3431,6 +3436,7 @@ int _create_symbol(mb_interpreter_t* s, _ls_node_t* l, char* sym, _object_t** ob
break; break;
} }
_exit:
return result; return result;
} }
@ -3638,7 +3644,7 @@ _end_import:
goto _exit; goto _exit;
} else if(_IS_FUNC(context->last_symbol, _core_enddef)) { } else if(_IS_FUNC(context->last_symbol, _core_enddef)) {
_end_routine(s); if(_end_routine(s))
_pop_scope(s); _pop_scope(s);
} }
} }
@ -5141,14 +5147,21 @@ void _begin_routine(mb_interpreter_t* s) {
context->routine_state++; context->routine_state++;
} }
void _end_routine(mb_interpreter_t* s) { bool_t _end_routine(mb_interpreter_t* s) {
/* End parsing a routine */ /* End parsing a routine */
_parsing_context_t* context = 0; _parsing_context_t* context = 0;
mb_assert(s); mb_assert(s);
context = s->parsing_context; context = s->parsing_context;
if(!context->routine_state) {
_handle_error_now(s, SE_RN_INVALID_ROUTINE, 0, MB_FUNC_ERR);
return false;
}
context->routine_state--; context->routine_state--;
return true;
} }
void _begin_routine_parameter_list(mb_interpreter_t* s) { void _begin_routine_parameter_list(mb_interpreter_t* s) {
@ -5330,11 +5343,13 @@ _ls_node_t* _search_identifier_in_scope_chain(mb_interpreter_t* s, _running_cont
else else
running = s->running_context; running = s->running_context;
while(running && !result) { while(running && !result) {
if(running->var_dict) {
result = _ht_find(running->var_dict, n); result = _ht_find(running->var_dict, n);
if(!result && running->meta == _SCOPE_META_REF) if(!result && running->meta == _SCOPE_META_REF)
result = _ht_find(running->ref->var_dict, n); result = _ht_find(running->ref->var_dict, n);
if(result) if(result)
break; break;
}
running = running->prev; running = running->prev;
} }
@ -8000,9 +8015,6 @@ int mb_run(struct mb_interpreter_t* s) {
/* Run loaded and parsed script */ /* Run loaded and parsed script */
int result = MB_FUNC_OK; int result = MB_FUNC_OK;
_ls_node_t* ast = 0; _ls_node_t* ast = 0;
_running_context_t* running = 0;
running = s->running_context;
_destroy_parsing_context(&s->parsing_context); _destroy_parsing_context(&s->parsing_context);