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

+added support to apply the STR statement to a type value.

Browse Source 
*fixed a referencing bug with an unnamed array.
This commit is contained in:
Wang Renxin 2017-10-30 14:11:35 +08:00
parent 330e6a7f0f
commit dc7ecd8ed8
3 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -1,3 +1,7 @@
Oct. 30 2017
Added support to apply the STR statement to a type value
Fixed a referencing bug with an unnamed array
Oct. 29 2017 Oct. 29 2017
Fixed a crash bug when access an unnamed array Fixed a crash bug when access an unnamed array

BIN
MY-BASIC Quick Reference.pdf
View File

Binary file not shown.

32
core/my_basic.c
View File

@ -1551,12 +1551,12 @@ static void _real_to_str(real_t r, char* str, size_t size, size_t afterpoint);
break; break;
#else /* MB_ENABLE_ARRAY_REF */ #else /* MB_ENABLE_ARRAY_REF */
# define _REF_ARRAY(__o) case _DT_ARRAY: { (void)(__o); } break; # define _REF_ARRAY(__o) case _DT_ARRAY: { (void)(__o); } break;
# define _UNREF_ARRAY(__o) \ # define _UNREF_ARRAY(__o) case _DT_ARRAY: { (void)(__o); } break;
case _DT_ARRAY: \
if(!(__o)->is_ref) \
_destroy_array((__o)->data.array); \
break;
# define _ADDGC_ARRAY(__o, __g) case _DT_ARRAY: { (void)(__o); (void)(__g); } break; # define _ADDGC_ARRAY(__o, __g) case _DT_ARRAY: { (void)(__o); (void)(__g); } break;
# define _DESTROY_ARRAY(__o) \
case _DT_ARRAY: \
_destroy_array((__o)->data.array); \
break;
#endif /* MB_ENABLE_ARRAY_REF */ #endif /* MB_ENABLE_ARRAY_REF */
#ifdef MB_ENABLE_COLLECTION_LIB #ifdef MB_ENABLE_COLLECTION_LIB
# define _REF_COLL(__o) \ # define _REF_COLL(__o) \
@ -4124,9 +4124,6 @@ _fast:
char* _str = _extract_string(c); char* _str = _extract_string(c);
(*val)->data.string = mb_strdup(_str, strlen(_str) + 1); (*val)->data.string = mb_strdup(_str, strlen(_str) + 1);
(*val)->is_ref = false; (*val)->is_ref = false;
} else if(c->type == _DT_ARRAY) {
(*val)->data = c->data;
c->type = _DT_NIL;
} else { } else {
(*val)->data = c->data; (*val)->data = c->data;
} }
@ -9584,7 +9581,11 @@ static int _dispose_object(_object_t* obj) {
break; break;
_UNREF_USERTYPE_REF(obj) _UNREF_USERTYPE_REF(obj)
#ifdef MB_ENABLE_ARRAY_REF
_UNREF_ARRAY(obj) _UNREF_ARRAY(obj)
#else /* MB_ENABLE_ARRAY_REF */
_DESTROY_ARRAY(obj)
#endif /* MB_ENABLE_ARRAY_REF */
_UNREF_COLL(obj) _UNREF_COLL(obj)
_UNREF_COLL_IT(obj) _UNREF_COLL_IT(obj)
_UNREF_CLASS(obj) _UNREF_CLASS(obj)
@ -12870,7 +12871,6 @@ int mb_init_array(struct mb_interpreter_t* s, void** l, mb_data_e t, int* d, int
_data_e type = _DT_NIL; _data_e type = _DT_NIL;
int j = 0; int j = 0;
int n = 0; int n = 0;
mb_unrefvar(t);
if(!s || !l || !d || !a) { if(!s || !l || !d || !a) {
result = MB_FUNC_ERR; result = MB_FUNC_ERR;
@ -12879,7 +12879,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_MANY_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++) {
@ -12898,6 +12898,7 @@ int mb_init_array(struct mb_interpreter_t* s, void** l, mb_data_e t, int* d, int
_handle_error_on_obj(s, SE_RN_COMPLEX_ARRAY_REQUIRED, s->source_file, DON2(l), MB_FUNC_ERR, _exit, result); _handle_error_on_obj(s, SE_RN_COMPLEX_ARRAY_REQUIRED, s->source_file, DON2(l), MB_FUNC_ERR, _exit, result);
} }
#else /* MB_SIMPLE_ARRAY */ #else /* MB_SIMPLE_ARRAY */
mb_unrefvar(t);
type = _DT_REAL; type = _DT_REAL;
#endif /* MB_SIMPLE_ARRAY */ #endif /* MB_SIMPLE_ARRAY */
@ -15064,6 +15065,10 @@ _proc_extra_var:
#endif /* MB_ENABLE_CLASS */ #endif /* MB_ENABLE_CLASS */
} else if(arr && literally) { } else if(arr && literally) {
if(val->type != _DT_UNKNOWN) { if(val->type != _DT_UNKNOWN) {
if(arr->name) {
_destroy_object(val, 0);
_handle_error_on_obj(s, SE_RN_INVALID_ID_USAGE, s->source_file, DON2(l), MB_FUNC_ERR, _exit, result);
}
#ifdef MB_ENABLE_ARRAY_REF #ifdef MB_ENABLE_ARRAY_REF
_unref(&arr_obj->data.array->ref, arr_obj->data.array); _unref(&arr_obj->data.array->ref, arr_obj->data.array);
#endif /* MB_ENABLE_ARRAY_REF */ #endif /* MB_ENABLE_ARRAY_REF */
@ -17217,6 +17222,13 @@ static int _std_str(mb_interpreter_t* s, void** l) {
#endif /* MB_MANUAL_REAL_FORMATTING */ #endif /* MB_MANUAL_REAL_FORMATTING */
break; break;
case MB_DT_TYPE: {
const char* sp = mb_get_type_string(arg.value.type);
char* ret = mb_strdup(sp, strlen(sp) + 1);
mb_check(mb_push_string(s, l, ret));
goto _exit;
}
#ifdef MB_ENABLE_CLASS #ifdef MB_ENABLE_CLASS
case MB_DT_CLASS: { case MB_DT_CLASS: {
bool_t got_tostr = false; bool_t got_tostr = false;