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

*polished code.

Browse Source
This commit is contained in:
Wang Renxin 2016-02-28 12:04:52 +08:00
parent 0dbcd684fd
commit d4137157a7
2 changed files with 13 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
core/my_basic.c
View File

@ -36,12 +36,12 @@
#else /* _MSC_VER */ #else /* _MSC_VER */
# include <stdint.h> # include <stdint.h>
#endif /* _MSC_VER */ #endif /* _MSC_VER */
#include <limits.h>
#ifndef ARDUINO #ifndef ARDUINO
# include <memory.h> # include <memory.h>
#endif /* ARDUINO */ #endif /* ARDUINO */
#include <assert.h> #include <assert.h>
#include <ctype.h> #include <ctype.h>
#include <limits.h>
#include <math.h> #include <math.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@ -660,13 +660,13 @@ static const _var_t _VAR_ARGS = { "...", 0 };
#define _CLASS_STATE_PROC 1 #define _CLASS_STATE_PROC 1
typedef enum _parsing_state_e { typedef enum _parsing_state_e {
_PS_NORMAL = 0, _PS_NORMAL,
_PS_STRING, _PS_STRING,
_PS_COMMENT _PS_COMMENT
} _parsing_state_e; } _parsing_state_e;
typedef enum _symbol_state_e { typedef enum _symbol_state_e {
_SS_IDENTIFIER = 0, _SS_IDENTIFIER,
_SS_OPERATOR _SS_OPERATOR
} _symbol_state_e; } _symbol_state_e;
@ -768,7 +768,7 @@ typedef struct mb_interpreter_t {
/* Operations */ /* Operations */
static const char _PRECEDE_TABLE[20][20] = { /* Operator priority table */ static const char _PRECEDE_TABLE[20][20] = { /* Operator priority table */
/* + - * / MOD ^ ( ) = > < >= <= == <> AND OR NOT NEG IS */ /* + - * / MOD ^ ( ) = > < >= <= == <> AND OR NOT NEG IS */
{ '>', '>', '<', '<', '<', '<', '<', '>', '>', '>', '>', '>', '>', '>', '>', '>', '>', '>', '>', '>' }, /* + */ { '>', '>', '<', '<', '<', '<', '<', '>', '>', '>', '>', '>', '>', '>', '>', '>', '>', '>', '>', '>' }, /* + */
{ '>', '>', '<', '<', '<', '<', '<', '>', '>', '>', '>', '>', '>', '>', '>', '>', '>', '>', '>', '>' }, /* - */ { '>', '>', '<', '<', '<', '<', '<', '>', '>', '>', '>', '>', '>', '>', '>', '>', '>', '>', '>', '>' }, /* - */
{ '>', '>', '>', '>', '>', '<', '<', '>', '>', '>', '>', '>', '>', '>', '>', '>', '>', '>', '>', '>' }, /* * */ { '>', '>', '>', '>', '>', '<', '<', '>', '>', '>', '>', '>', '>', '>', '>', '>', '>', '>', '>', '>' }, /* * */
@ -5824,9 +5824,8 @@ static void _init_array(_array_t* arr) {
arr->types = (_data_e*)mb_malloc(sizeof(_data_e) * arr->count); arr->types = (_data_e*)mb_malloc(sizeof(_data_e) * arr->count);
if(arr->types) { if(arr->types) {
unsigned int ul = 0; unsigned int ul = 0;
for(ul = 0; ul < arr->count; ++ul) { for(ul = 0; ul < arr->count; ++ul)
arr->types[ul] = _DT_INT; arr->types[ul] = _DT_INT;
}
} }
#endif /* MB_SIMPLE_ARRAY */ #endif /* MB_SIMPLE_ARRAY */
} }
@ -11880,6 +11879,7 @@ int mb_gets(char* buf, int s) {
if(fgets(buf, s, stdin) == 0) { if(fgets(buf, s, stdin) == 0) {
fprintf(stderr, "Error reading.\n"); fprintf(stderr, "Error reading.\n");
exit(1); exit(1);
} }
result = (int)strlen(buf); result = (int)strlen(buf);
@ -12888,11 +12888,10 @@ static int _core_for(mb_interpreter_t* s, void** l) {
var_loop = obj->data.variable; var_loop = obj->data.variable;
#ifdef MB_ENABLE_COLLECTION_LIB #ifdef MB_ENABLE_COLLECTION_LIB
if(ast && ast->next && _IS_FUNC(ast->next->data, _core_in)) { if(ast && ast->next && _IS_FUNC(ast->next->data, _core_in))
result = _execute_ranged_for_loop(s, &ast, var_loop); result = _execute_ranged_for_loop(s, &ast, var_loop);
} else { else
result = _execute_normal_for_loop(s, &ast, var_loop); result = _execute_normal_for_loop(s, &ast, var_loop);
}
#else /* MB_ENABLE_COLLECTION_LIB */ #else /* MB_ENABLE_COLLECTION_LIB */
result = _execute_normal_for_loop(s, &ast, var_loop); result = _execute_normal_for_loop(s, &ast, var_loop);
#endif /* MB_ENABLE_COLLECTION_LIB */ #endif /* MB_ENABLE_COLLECTION_LIB */

14
shell/main.c
View File

@ -415,9 +415,8 @@ static void _destroy_code(void) {
mb_assert(code); mb_assert(code);
for(i = 0; i < code->count; ++i) { for(i = 0; i < code->count; ++i)
free(code->lines[i]); free(code->lines[i]);
}
free(code->lines); free(code->lines);
free(code); free(code);
} }
@ -427,9 +426,8 @@ static void _clear_code(void) {
mb_assert(code); mb_assert(code);
for(i = 0; i < code->count; ++i) { for(i = 0; i < code->count; ++i)
free(code->lines[i]); free(code->lines[i]);
}
code->count = 0; code->count = 0;
} }
@ -552,9 +550,8 @@ static void _destroy_importing_directories(void) {
if(!importing_dirs) return; if(!importing_dirs) return;
for(i = 0; i < importing_dirs->count; ++i) { for(i = 0; i < importing_dirs->count; ++i)
free(importing_dirs->dirs[i]); free(importing_dirs->dirs[i]);
}
free(importing_dirs->dirs); free(importing_dirs->dirs);
free(importing_dirs); free(importing_dirs);
} }
@ -1006,9 +1003,8 @@ static void _evaluate_expression(char* p) {
} else { } else {
_printf("Invalid expression.\n"); _printf("Invalid expression.\n");
} }
if(a) { if(a)
free(e); free(e);
}
} }
static bool_t _process_parameters(int argc, char* argv[]) { static bool_t _process_parameters(int argc, char* argv[]) {
@ -1370,7 +1366,7 @@ static void _on_exit(void) {
#endif /* _USE_MEM_POOL */ #endif /* _USE_MEM_POOL */
#if defined _MSC_VER && !defined _WIN64 #if defined _MSC_VER && !defined _WIN64
if(0 != _CrtDumpMemoryLeaks()) { _asm { int 3 } } if(!!_CrtDumpMemoryLeaks()) { _asm { int 3 } }
#elif _USE_MEM_POOL #elif _USE_MEM_POOL
if(alloc_count > 0 || alloc_bytes > 0) { mb_assert(0 && "Memory leak."); } if(alloc_count > 0 || alloc_bytes > 0) { mb_assert(0 && "Memory leak."); }
#endif /* _MSC_VER && !_WIN64 */ #endif /* _MSC_VER && !_WIN64 */