dan
/
TIC-80-guile
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

numbers parsing optimisation

This commit is contained in:
BADIM-PC\Vadim 2017-12-20 22:59:45 +03:00
parent b4b002464d
commit 354c0a4701
1 changed files with 17 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/code.c
View File

@ -430,6 +430,7 @@ static void parse(const char* start, u8* color)
ptr = end ? end + strlen(BlockCommentEnd) : blockCommentStart + strlen(blockCommentStart); ptr = end ? end + strlen(BlockCommentEnd) : blockCommentStart + strlen(blockCommentStart);
memset(color + (blockCommentStart - start), getConfig()->theme.code.comment, ptr - blockCommentStart); memset(color + (blockCommentStart - start), getConfig()->theme.code.comment, ptr - blockCommentStart);
blockCommentStart = NULL; blockCommentStart = NULL;
continue;
} }
else if(blockStringStart) else if(blockStringStart)
{ {
@ -460,6 +461,7 @@ static void parse(const char* start, u8* color)
memset(color + (blockStringStart - start), getConfig()->theme.code.string, ptr - blockStringStart); memset(color + (blockStringStart - start), getConfig()->theme.code.string, ptr - blockStringStart);
blockStringStart = NULL; blockStringStart = NULL;
continue;
} }
else if(singleCommentStart) else if(singleCommentStart)
{ {
@ -467,52 +469,33 @@ static void parse(const char* start, u8* color)
memset(color + (singleCommentStart - start), getConfig()->theme.code.comment, ptr - singleCommentStart); memset(color + (singleCommentStart - start), getConfig()->theme.code.comment, ptr - singleCommentStart);
singleCommentStart = NULL; singleCommentStart = NULL;
continue;
} }
else if(numberStart) else if(numberStart)
{ {
bool digit = true;
while(!islineend(*ptr)) while(!islineend(*ptr))
{ {
char c = *ptr; char c = *ptr;
if(isdigit(c)) if(isdigit(c)) ptr++;
else if(numberStart[0] == '0'
&& (numberStart[1] == 'x' || numberStart[1] == 'X')
&& isxdigit(numberStart[2]))
{ {
ptr++; if((ptr - numberStart < 2) || (ptr - numberStart >= 2 && isxdigit(c))) ptr++;
}
else if(numberStart[0] == '0' && (numberStart[1] == 'x' || numberStart[1] == 'X'))
{
if(ptr - numberStart <= 2)
{
ptr++;
}
else if(ptr - numberStart > 2 && isxdigit(c))
{
ptr++;
}
else
{
digit = false;
break;
}
}
else if(c == '.' || c == 'e')
{
if(isdigit(ptr[1]))
ptr++;
else break; else break;
} }
else if(isalpha(c) || c == '_') else if(c == '.' || c == 'e' || c == 'E')
{ {
digit = false; if(isdigit(ptr[1])) ptr++;
break; else break;
} }
else break; else break;
} }
if(digit) memset(color + (numberStart - start), getConfig()->theme.code.number, ptr - numberStart);
memset(color + (numberStart - start), getConfig()->theme.code.number, ptr - numberStart);
numberStart = NULL; numberStart = NULL;
continue;
} }
else else
{ {
@ -549,6 +532,10 @@ static void parse(const char* start, u8* color)
ptr += 1; ptr += 1;
continue; continue;
} }
else
{
// other stuff
}
} }
} }
} }