OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- Removed some unnecessary morphing code.

Browse source 
- Fixed some bugs in the HIRESTEX parser.
- Added floating point support and #include and #define tokens to 
  FParseContext  Not used yet.
- replaced the value scanning code in FParseContext::GetToken with
  calls to strtol.


SVN r893 (trunk)
This commit is contained in:
Christoph Oelckers 2008-04-08 17:25:19 +00:00
commit f7a1fb3978
8 changed files with 49 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

62
src/parsecontext.cpp
View file

@ -103,41 +103,29 @@ loop:
c = *sourcep++;
if (c == 'x' || c == 'X')
{
for (;;)
{
c = *sourcep++;
if (isdigit (c))
{
buildup = (buildup<<4) + c - '0';
}
else if (c >= 'a' && c <= 'f')
{
buildup = (buildup<<4) + c - 'a' + 10;
}
else if (c >= 'A' && c <= 'F')
{
buildup = (buildup<<4) + c - 'A' + 10;
}
else
{
sourcep--;
yylval->val = buildup;
return TokenTrans[NUM];
}
}
yylval->val = (int)strtol(sourcep, &sourcep, 16);
return TokenTrans[NUM];
}
else
{
sourcep--;
}
}
while (isdigit (c = *sourcep++))
{
buildup = buildup*10 + c - '0';
}
char *endp;
sourcep--;
yylval->val = buildup;
return TokenTrans[NUM];
yylval->val = (int)strtol(sourcep, &endp, 10);
if (*endp == '.')
{
// It's a float
yylval->fval = strtod(sourcep, &sourcep);
return TokenTrans[FLOATVAL];
}
else
{
sourcep = endp;
return TokenTrans[NUM];
}
}
if (isalpha (c))
{
@ -162,7 +150,8 @@ loop:
}
if (FindSym (token, &yylval->symval))
{
return TokenTrans[SYMNUM];
yylval->val = yylval->symval->Value;
return TokenTrans[NUM];
}
if ((yylval->val = P_FindLineSpecial(token)) != 0)
{
@ -173,7 +162,7 @@ loop:
}
if (c == '/')
{
c = *sourcep++;;
c = *sourcep++;
if (c == '*')
{
for (;;)
@ -258,6 +247,19 @@ loop:
c--;
return 0;
}
if (c == '#')
{
if (!strnicmp(sourcep, "include", 7))
{
sourcep+=7;
return TokenTrans[INCLUDE];
}
if (!strnicmp(sourcep, "define", 6))
{
sourcep+=6;
return TokenTrans[DEFINE];
}
}
switch (c)
{
case '^': return TokenTrans[XOR];