*fixed some compile issues with cpp compiler.

This commit is contained in:
Wang Renxin 2018-02-12 14:56:29 +08:00
parent 49b1e1bf55
commit 7b6fda8011

View File

@ -3821,11 +3821,6 @@ static int _calc_expression(mb_interpreter_t* s, _ls_node_t** l, _object_t** val
}
} else {
if(c->type == _DT_ARRAY) {
unsigned arr_idx = 0;
mb_value_u arr_val;
_data_e arr_type;
_object_t* arr_elem = 0;
#ifdef MB_ENABLE_CLASS
if(s->last_instance) {
_ls_node_t* cs = _search_identifier_in_scope_chain(s, 0, c->data.array->name, _PATHING_NORMAL, 0, 0);
@ -3838,6 +3833,10 @@ _array:
_ls_pushback(opnd, c);
f++;
} else {
unsigned arr_idx = 0;
mb_value_u arr_val;
_data_e arr_type;
_object_t* arr_elem = 0;
ast = ast->prev;
result = _get_array_index(s, &ast, c, &arr_idx, 0);
if(result != MB_FUNC_OK) {
@ -3912,12 +3911,13 @@ _array:
_ls_pushback(opnd, c);
f++;
} else if(c->type == _DT_ROUTINE) {
_routine:
do {
#ifdef MB_ENABLE_CLASS
bool_t calling = false;
_object_t* obj = 0;
_ls_node_t* fn = 0;
#endif /* MB_ENABLE_CLASS */
_routine:
ast = ast->prev;
#ifdef MB_ENABLE_CLASS
calling = s->calling;
@ -3941,6 +3941,7 @@ _routine:
}
}
#endif /* MB_ENABLE_CLASS */
} while(0);
if(ast)
ast = ast->prev;
if(result == MB_FUNC_END)
@ -4005,6 +4006,7 @@ _routine:
}
} else {
if(c->type == _DT_VAR) {
do {
_ls_node_t* cs = _search_identifier_in_scope_chain(s, 0, c->data.variable->name,
#ifdef MB_ENABLE_CLASS
_PU(c->data.variable->pathing),
@ -4039,6 +4041,7 @@ _routine:
}
}
}
} while(0);
#ifdef MB_ENABLE_CLASS
_var:
#endif /* MB_ENABLE_CLASS */