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

+added endian determination for object comparison. *fixed some compile issues.

Browse Source
This commit is contained in:
Wang Renxin 2016-06-15 10:52:25 +08:00 committed by GitHub
parent f4305c478e
commit f9f10e47d8
1 changed files with 25 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
core/my_basic.c
View File

@ -1192,6 +1192,8 @@ static char* mb_strupr(char* s);
#define safe_free(__p) do { if(__p) { mb_free(__p); __p = 0; } else { mb_assert(0 && "Memory already released."); } } while(0) #define safe_free(__p) do { if(__p) { mb_free(__p); __p = 0; } else { mb_assert(0 && "Memory already released."); } } while(0)
static bool_t mb_is_little_endian(void);
/** Unicode handling */ /** Unicode handling */
static int mb_uu_getbom(const char** ch); static int mb_uu_getbom(const char** ch);
@ -2610,12 +2612,21 @@ static int _ht_cmp_object(void* d1, void* d2) {
#ifdef MB_ENABLE_CLASS #ifdef MB_ENABLE_CLASS
_default: _default:
#endif /* MB_ENABLE_CLASS */ #endif /* MB_ENABLE_CLASS */
if(mb_is_little_endian()) {
for(i = sizeof(_raw_t) - 1; i >= 0; --i) {
if(o1->data.raw[i] < o2->data.raw[i])
return -1;
else if(o1->data.raw[i] > o2->data.raw[i])
return 1;
}
} else {
for(i = 0; i < sizeof(_raw_t); ++i) { for(i = 0; i < sizeof(_raw_t); ++i) {
if(o1->data.raw[i] < o2->data.raw[i]) if(o1->data.raw[i] < o2->data.raw[i])
return -1; return -1;
else if(o1->data.raw[i] > o2->data.raw[i]) else if(o1->data.raw[i] > o2->data.raw[i])
return 1; return 1;
} }
}
break; break;
} }
@ -2927,6 +2938,13 @@ static char* mb_strupr(char* s) {
return t; return t;
} }
/* Determine whether it's running on a little endian platform */
static bool_t mb_is_little_endian(void) {
int i = 1;
return ((char*)&i)[0] == 1;
}
/** Unicode handling */ /** Unicode handling */
/* Determine whether a string begins with a BOM, and ignore it */ /* Determine whether a string begins with a BOM, and ignore it */
@ -12549,7 +12567,7 @@ static int _core_neg(mb_interpreter_t* s, void** l) {
mb_assert(s && l); mb_assert(s && l);
running = s->running_context; running = s->running_context;
ast = *l; ast = (_ls_node_t*)*l;
if(ast) ast = ast->next; if(ast) ast = ast->next;
if(!_ls_empty(s->in_neg_expr)) if(!_ls_empty(s->in_neg_expr))
@ -12826,7 +12844,7 @@ static int _core_not(mb_interpreter_t* s, void** l) {
mb_assert(s && l); mb_assert(s && l);
running = s->running_context; running = s->running_context;
ast = *l; ast = (_ls_node_t*)*l;
if(ast) ast = ast->next; if(ast) ast = ast->next;
calc_depth = running->calc_depth; calc_depth = running->calc_depth;