nortti
/
sortix-mirror
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Highlight binary constants in the editor.

This commit is contained in:
Jonas 'Sortie' Termansen 2014-12-28 19:31:36 +01:00
parent 524a028a4f
commit 6c339085fe
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
editor/highlight.c++
View File

@ -53,6 +53,7 @@ bool should_highlight_path(const char* path)
size_t recognize_constant(const wchar_t* string, size_t string_length) size_t recognize_constant(const wchar_t* string, size_t string_length)
{ {
bool binary = false;
bool hex = false; bool hex = false;
size_t result = 0; size_t result = 0;
if ( result < string_length && string[result] == L'0' ) if ( result < string_length && string[result] == L'0' )
@ -64,12 +65,19 @@ size_t recognize_constant(const wchar_t* string, size_t string_length)
result++; result++;
hex = true; hex = true;
} }
if ( result < string_length && (string[result] == L'b' ||
string[result] == L'B') )
{
result++;
binary = true;
}
} }
bool floating = false; bool floating = false;
bool exponent = false; bool exponent = false;
while ( result < string_length ) while ( result < string_length )
{ {
if ( (L'0' <= string[result] && string[result] <= L'9') || if ( (binary && L'0' <= string[result] && string[result] <= L'1') ||
(!binary && L'0' <= string[result] && string[result] <= L'9') ||
(hex && L'a' <= string[result] && string[result] <= L'f') || (hex && L'a' <= string[result] && string[result] <= L'f') ||
(hex && L'A' <= string[result] && string[result] <= L'F') ) (hex && L'A' <= string[result] && string[result] <= L'F') )
{ {
@ -78,13 +86,14 @@ size_t recognize_constant(const wchar_t* string, size_t string_length)
} }
if ( string[result] == L'.' ) if ( string[result] == L'.' )
{ {
if ( hex || floating ) if ( binary || hex || floating )
return 0; return 0;
floating = true; floating = true;
result++; result++;
continue; continue;
} }
if ( !hex && (string[result] == L'e' || string[result] == L'E') ) if ( !(hex || binary) &&
(string[result] == L'e' || string[result] == L'E') )
{ {
if ( !result ) if ( !result )
return 0; return 0;
@ -96,7 +105,7 @@ size_t recognize_constant(const wchar_t* string, size_t string_length)
} }
break; break;
} }
if ( result == (hex ? 2 : 0) ) if ( result == ((hex || binary) ? 2 : 0) )
return 0; return 0;
if ( floating ) if ( floating )
{ {