gh-mirror/mikepaul-LuaJIT
1
0
Fork 0
mirror of https://github.com/LuaJIT/LuaJIT.git synced 2025-02-07 23:24:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into v2.1

Browse Source
This commit is contained in:
Mike Pall 2016-04-24 17:14:35 +02:00
commit d8ac6230ed
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/lj_cparse.c
View File

@ -297,13 +297,17 @@ static CPToken cp_next_(CPState *cp)
else return '/'; else return '/';
break; break;
case '|': case '|':
if (cp_get(cp) != '|') return '|'; cp_get(cp); return CTOK_OROR; if (cp_get(cp) != '|') return '|';
cp_get(cp); return CTOK_OROR;
case '&': case '&':
if (cp_get(cp) != '&') return '&'; cp_get(cp); return CTOK_ANDAND; if (cp_get(cp) != '&') return '&';
cp_get(cp); return CTOK_ANDAND;
case '=': case '=':
if (cp_get(cp) != '=') return '='; cp_get(cp); return CTOK_EQ; if (cp_get(cp) != '=') return '=';
cp_get(cp); return CTOK_EQ;
case '!': case '!':
if (cp_get(cp) != '=') return '!'; cp_get(cp); return CTOK_NE; if (cp_get(cp) != '=') return '!';
cp_get(cp); return CTOK_NE;
case '<': case '<':
if (cp_get(cp) == '=') { cp_get(cp); return CTOK_LE; } if (cp_get(cp) == '=') { cp_get(cp); return CTOK_LE; }
else if (cp->c == '<') { cp_get(cp); return CTOK_SHL; } else if (cp->c == '<') { cp_get(cp); return CTOK_SHL; }
@ -313,7 +317,8 @@ static CPToken cp_next_(CPState *cp)
else if (cp->c == '>') { cp_get(cp); return CTOK_SHR; } else if (cp->c == '>') { cp_get(cp); return CTOK_SHR; }
return '>'; return '>';
case '-': case '-':
if (cp_get(cp) != '>') return '-'; cp_get(cp); return CTOK_DEREF; if (cp_get(cp) != '>') return '-';
cp_get(cp); return CTOK_DEREF;
case '$': case '$':
return cp_param(cp); return cp_param(cp);
case '\0': return CTOK_EOF; case '\0': return CTOK_EOF;

8
src/lj_strfmt.c
View File

@ -98,11 +98,15 @@ char * LJ_FASTCALL lj_strfmt_wint(char *p, int32_t k)
uint32_t u = (uint32_t)k; uint32_t u = (uint32_t)k;
if (k < 0) { u = (uint32_t)-k; *p++ = '-'; } if (k < 0) { u = (uint32_t)-k; *p++ = '-'; }
if (u < 10000) { if (u < 10000) {
if (u < 10) goto dig1; if (u < 100) goto dig2; if (u < 1000) goto dig3; if (u < 10) goto dig1;
if (u < 100) goto dig2;
if (u < 1000) goto dig3;
} else { } else {
uint32_t v = u / 10000; u -= v * 10000; uint32_t v = u / 10000; u -= v * 10000;
if (v < 10000) { if (v < 10000) {
if (v < 10) goto dig5; if (v < 100) goto dig6; if (v < 1000) goto dig7; if (v < 10) goto dig5;
if (v < 100) goto dig6;
if (v < 1000) goto dig7;
} else { } else {
uint32_t w = v / 10000; v -= w * 10000; uint32_t w = v / 10000; v -= w * 10000;
if (w >= 10) WINT_R(w, 10, 10) if (w >= 10) WINT_R(w, 10, 10)