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

Merge pull request #10 from wwiv/master

Browse Source 
*rename _is_using_char to _is_using_at_char; +add way to disable _load_file.
This commit is contained in:
Wang Renxin 2017-01-01 14:20:29 +08:00 committed by GitHub
commit 12d2da291d
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/my_basic.c
View File

@ -32,6 +32,7 @@
#include "my_basic.h"
#if defined ARDUINO && !defined MB_CP_ARDUINO
# define MB_CP_ARDUINO
# define MB_DISABLE_LOAD_FILE
#endif /* ARDUINO && !MB_CP_ARDUINO */
#ifdef MB_CP_VC
# include <conio.h>
@ -1394,7 +1395,7 @@ static bool_t _is_numeric_char(char c);
static bool_t _is_identifier_char(char c);
static bool_t _is_operator_char(char c);
static bool_t _is_exponential_char(char c);
static bool_t _is_using_char(char c);
static bool_t _is_using_at_char(char c);
static bool_t _is_exponent_prefix(char* s, int begin, int end);
static int _append_char_to_symbol(mb_interpreter_t* s, char c);
@ -4606,7 +4607,7 @@ static void _print_string(mb_interpreter_t* s, _object_t* obj) {
/* Read all content of a file into a buffer */
static char* _load_file(mb_interpreter_t* s, const char* f, const char* prefix) {
#ifndef MB_CP_ARDUINO
#ifndef MB_DISABLE_LOAD_FILE
FILE* fp = 0;
char* buf = 0;
long curpos = 0;
@ -4737,7 +4738,7 @@ static bool_t _is_exponential_char(char c) {
}
/* Determine whether a character is module using char */
static bool_t _is_using_char(char c) {
static bool_t _is_using_at_char(char c) {
return (c == '@');
}
@ -5186,7 +5187,7 @@ static _data_e _get_symbol_type(mb_interpreter_t* s, char* sym, _raw_t* value) {
sym[_sl - 1] = _ZERO_CHAR;
context->parsing_state = _PS_NORMAL;
/* Using a module */
if(_is_using_char(*(sym + 1))) {
if(_is_using_at_char(*(sym + 1))) {
#ifdef MB_ENABLE_MODULE
char* ns = mb_strdup(sym + 2, strlen(sym + 2) + 1);
mb_strupr(ns);