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

*fixed a type parsing of sub routine bug; *fixed a scope processing bug.

Browse Source
This commit is contained in:
Wang Renxin 2015-09-08 13:26:54 +08:00
parent fe3e7db9c9
commit da3ad153b1
1 changed files with 33 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
core/my_basic.c
View File

@ -78,7 +78,7 @@ extern "C" {
/** Macros */ /** Macros */
#define _VER_MAJOR 1 #define _VER_MAJOR 1
#define _VER_MINOR 1 #define _VER_MINOR 1
#define _VER_REVISION 67 #define _VER_REVISION 68
#define _MB_VERSION ((_VER_MAJOR * 0x01000000) + (_VER_MINOR * 0x00010000) + (_VER_REVISION)) #define _MB_VERSION ((_VER_MAJOR * 0x01000000) + (_VER_MINOR * 0x00010000) + (_VER_REVISION))
/* Uncomment the line below to treat warning as error */ /* Uncomment the line below to treat warning as error */
@ -2479,8 +2479,7 @@ _data_e _get_symbol_type(mb_interpreter_t* s, char* sym, _raw_t* value) {
goto _exit; goto _exit;
} }
if(context->last_symbol && context->last_symbol->type == _DT_FUNC) { if(context->last_symbol && _IS_FUNC(context->last_symbol, _core_dim)) {
if(context->last_symbol->data.func->pointer == _core_dim) {
#ifdef MB_SIMPLE_ARRAY #ifdef MB_SIMPLE_ARRAY
en = (sym[_sl - 1] == '$' ? _DT_STRING : _DT_REAL); en = (sym[_sl - 1] == '$' ? _DT_STRING : _DT_REAL);
#else /* MB_SIMPLE_ARRAY */ #else /* MB_SIMPLE_ARRAY */
@ -2492,10 +2491,8 @@ _data_e _get_symbol_type(mb_interpreter_t* s, char* sym, _raw_t* value) {
goto _exit; goto _exit;
} }
}
/* _class_t */ /* _class_t */
if(context->last_symbol && context->last_symbol->type == _DT_FUNC) { if(context->last_symbol && _IS_FUNC(context->last_symbol, _core_class)) {
if(context->last_symbol->data.func->pointer == _core_class) {
glbsyminscope = _search_var_in_scope_chain(s, 0, sym); glbsyminscope = _search_var_in_scope_chain(s, 0, sym);
if(glbsyminscope && ((_object_t*)(glbsyminscope->data))->type == _DT_VAR) { if(glbsyminscope && ((_object_t*)(glbsyminscope->data))->type == _DT_VAR) {
tmp.obj = (_object_t*)(glbsyminscope->data); tmp.obj = (_object_t*)(glbsyminscope->data);
@ -2513,19 +2510,18 @@ _data_e _get_symbol_type(mb_interpreter_t* s, char* sym, _raw_t* value) {
goto _exit; goto _exit;
} }
}
/* _routine_t */ /* _routine_t */
if(context->last_symbol && context->last_symbol->type == _DT_FUNC) { if(context->last_symbol) {
glbsyminscope = _search_var_in_scope_chain(s, 0, sym); glbsyminscope = _search_var_in_scope_chain(s, 0, sym);
if(glbsyminscope && ((_object_t*)glbsyminscope->data)->type == _DT_ROUTINE) { if(glbsyminscope && ((_object_t*)glbsyminscope->data)->type == _DT_ROUTINE) {
if(context->last_symbol->data.func->pointer == _core_def) if(_IS_FUNC(context->last_symbol, _core_def))
_begin_routine(s); _begin_routine(s);
result = _DT_ROUTINE; result = _DT_ROUTINE;
goto _exit; goto _exit;
} }
if(context->last_symbol->data.func->pointer == _core_def || context->last_symbol->data.func->pointer == _core_call) { if(_IS_FUNC(context->last_symbol, _core_def) || _IS_FUNC(context->last_symbol, _core_call)) {
if(context->last_symbol->data.func->pointer == _core_def) if(_IS_FUNC(context->last_symbol, _core_def))
_begin_routine(s); _begin_routine(s);
if(!_is_identifier_char(sym[0])) { if(!_is_identifier_char(sym[0])) {
result = _DT_NIL; result = _DT_NIL;
@ -2548,7 +2544,7 @@ _data_e _get_symbol_type(mb_interpreter_t* s, char* sym, _raw_t* value) {
result = _DT_ROUTINE; result = _DT_ROUTINE;
goto _exit; goto _exit;
} else if(context->last_symbol->data.func->pointer == _core_enddef) { } else if(_IS_FUNC(context->last_symbol, _core_enddef)) {
_end_routine(s); _end_routine(s);
_pop_scope(s); _pop_scope(s);
} }
@ -2624,13 +2620,11 @@ _data_e _get_symbol_type(mb_interpreter_t* s, char* sym, _raw_t* value) {
goto _exit; goto _exit;
} }
} }
if(context->last_symbol && context->last_symbol->type == _DT_FUNC) { if(context->last_symbol && (_IS_FUNC(context->last_symbol, _core_goto) || _IS_FUNC(context->last_symbol, _core_gosub))) {
if(context->last_symbol->data.func->pointer == _core_goto || context->last_symbol->data.func->pointer == _core_gosub) {
result = _DT_LABEL; result = _DT_LABEL;
goto _exit; goto _exit;
} }
}
/* Otherwise */ /* Otherwise */
result = _DT_VAR; result = _DT_VAR;
@ -3673,7 +3667,7 @@ int _skip_to(mb_interpreter_t* s, _ls_node_t** l, mb_func_t f, _data_e t) {
obj = (_object_t*)(ast->data); obj = (_object_t*)(ast->data);
*l = ast; *l = ast;
ast = ast->next; ast = ast->next;
} while(!(obj->type == _DT_FUNC && obj->data.func->pointer == f) && obj->type != t); } while(!(_IS_FUNC(obj, f)) && obj->type != t);
_exit: _exit:
return result; return result;
@ -4759,9 +4753,6 @@ int mb_run(struct mb_interpreter_t* s) {
running = s->running_context; running = s->running_context;
while(s->running_context->prev)
s->running_context = s->running_context->prev;
if(s->parsing_context) if(s->parsing_context)
safe_free(s->parsing_context); safe_free(s->parsing_context);
@ -4771,6 +4762,8 @@ int mb_run(struct mb_interpreter_t* s) {
s->suspent_point = 0; s->suspent_point = 0;
} else { } else {
mb_assert(!s->no_eat_comma_mark); mb_assert(!s->no_eat_comma_mark);
while(s->running_context->prev)
s->running_context = s->running_context->prev;
ast = s->ast; ast = s->ast;
ast = ast->next; ast = ast->next;
if(!ast) { if(!ast) {