fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

Yeah, I suck. Really works properly now. Maybe.

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@3357 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
Spoike 2009-08-29 17:24:20 +00:00
parent 5e5ad719c2
commit 5a5f38dbfc
1 changed files with 30 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
engine/qclib/qcc_pr_lex.c
View file

@ -1333,7 +1333,7 @@ void QCC_PR_LexNumber (void)
{ {
int tokenlen = 0; int tokenlen = 0;
int num=0; int num=0;
int base=10; int base=0;
int c; int c;
int sign=1; int sign=1;
if (*pr_file_p == '-') if (*pr_file_p == '-')
@ -1352,6 +1352,11 @@ void QCC_PR_LexNumber (void)
pr_token[tokenlen++] = 'x'; pr_token[tokenlen++] = 'x';
} }
pr_immediate_type = NULL;
//assume base 10 if not stated
if (!base)
base = 10;
while((c = *pr_file_p)) while((c = *pr_file_p))
{ {
if (c >= '0' && c <= '9') if (c >= '0' && c <= '9')
@ -1360,13 +1365,13 @@ void QCC_PR_LexNumber (void)
num*=base; num*=base;
num += c-'0'; num += c-'0';
} }
else if (c >= 'a' && c <= 'f') else if (c >= 'a' && c <= 'f' && base > 10)
{ {
pr_token[tokenlen++] = c; pr_token[tokenlen++] = c;
num*=base; num*=base;
num += c -'a'+10; num += c -'a'+10;
} }
else if (c >= 'A' && c <= 'F') else if (c >= 'A' && c <= 'F' && base > 10)
{ {
pr_token[tokenlen++] = c; pr_token[tokenlen++] = c;
num*=base; num*=base;
@ -1384,9 +1389,15 @@ void QCC_PR_LexNumber (void)
c = *pr_file_p; c = *pr_file_p;
if (c >= '0' && c <= '9') if (c >= '0' && c <= '9')
{ {
num*=base; pr_token[tokenlen++] = c;
num*=10;
pr_immediate._float += (c-'0')/(float)(num); pr_immediate._float += (c-'0')/(float)(num);
} }
else if (c == 'f')
{
pr_file_p++;
break;
}
else else
{ {
break; break;
@ -1394,22 +1405,33 @@ void QCC_PR_LexNumber (void)
pr_file_p++; pr_file_p++;
} }
pr_immediate._float *= sign; pr_immediate._float *= sign;
pr_token[tokenlen++] = 0;
return; return;
} }
else if (c == 'i') else if (c == 'i')
{ {
pr_token[tokenlen++] = 'x'; pr_token[tokenlen++] = c;
pr_token[tokenlen++] = 0;
pr_file_p++; pr_file_p++;
pr_immediate_type = type_integer; pr_immediate_type = type_integer;
pr_immediate._int = num*sign; pr_immediate._int = num*sign;
return; return;
} }
else break; else
break;
pr_file_p++; pr_file_p++;
} }
pr_token[tokenlen++] = 0; pr_token[tokenlen++] = 0;
if (flag_assume_integer) if (!pr_immediate_type)
{
if (flag_assume_integer)
pr_immediate_type = type_integer;
else
pr_immediate_type = type_float;
}
if (pr_immediate_type == type_integer)
{ {
pr_immediate_type = type_integer; pr_immediate_type = type_integer;
pr_immediate._int = num*sign; pr_immediate._int = num*sign;
@ -2507,6 +2529,7 @@ void QCC_PR_Lex (void)
// character is reached // character is reached
if ( c == '~' || c == '%') //let's see which one we make into an operator first... possibly both... if ( c == '~' || c == '%') //let's see which one we make into an operator first... possibly both...
{ {
QCC_PR_ParseWarning(0, "~ or % prefixes to denote integers are deprecated. Please use a postfix of 'i'");
pr_file_p++; pr_file_p++;
pr_token_type = tt_immediate; pr_token_type = tt_immediate;
pr_immediate_type = type_integer; pr_immediate_type = type_integer;
@ -2522,11 +2545,6 @@ void QCC_PR_Lex (void)
if ( (c == '.'&&pr_file_p[1] >='0' && pr_file_p[1] <= '9') || (c >= '0' && c <= '9') || ( c=='-' && pr_file_p[1]>='0' && pr_file_p[1] <='9') ) if ( (c == '.'&&pr_file_p[1] >='0' && pr_file_p[1] <= '9') || (c >= '0' && c <= '9') || ( c=='-' && pr_file_p[1]>='0' && pr_file_p[1] <='9') )
{ {
pr_token_type = tt_immediate; pr_token_type = tt_immediate;
// pr_immediate_type = type_float;
// pr_immediate._float = QCC_PR_LexFloat ();
pr_token_type = tt_immediate;
QCC_PR_LexNumber (); QCC_PR_LexNumber ();
return; return;
} }