mirror of
https://github.com/ZDoom/raze-gles.git
synced 2024-12-27 20:20:40 +00:00
- redid scriptfile as a wrapper around FScanner
Another piece of Build licensed code gone, yay! This will also allow gradual conversion of the DEF parser to our own code, unencumbered by the Build license. :)
This commit is contained in:
Christoph Oelckers
parent
e382690f9c
commit
09a6534270
5 changed files with 114 additions and 498 deletions
|
|
@ -772,7 +772,6 @@ set (PCH_SOURCES
|
|||
build/src/engine.cpp
|
||||
build/src/mdsprite.cpp
|
||||
build/src/polymost.cpp
|
||||
build/src/scriptfile.cpp
|
||||
build/src/voxmodel.cpp
|
||||
|
||||
core/movie/playmve.cpp
|
||||
|
|
|
|||
|
|
@ -3,39 +3,98 @@
|
|||
#define BUILD_SCRIPTFILE_H_
|
||||
|
||||
#include "sc_man.h"
|
||||
#include "filesystem.h"
|
||||
|
||||
typedef struct {
|
||||
char *textbuf;
|
||||
uint32_t textlength;
|
||||
char *ltextptr; // pointer to start of the last token fetched (use this for line numbers)
|
||||
char *textptr;
|
||||
char *eof;
|
||||
char *filename;
|
||||
int32_t linenum;
|
||||
int32_t *lineoffs;
|
||||
} scriptfile;
|
||||
|
||||
char *scriptfile_gettoken(scriptfile *sf);
|
||||
int32_t scriptfile_getnumber(scriptfile *sf, int32_t *num);
|
||||
int32_t scriptfile_getdouble(scriptfile *sf, double *num);
|
||||
int32_t scriptfile_getstring(scriptfile *sf, FString *st);
|
||||
int scriptfile_getsymbol(scriptfile *sf, int32_t *num);
|
||||
int32_t scriptfile_getlinum(const scriptfile *sf, const char *ptr);
|
||||
FScriptPosition scriptfile_getposition(const scriptfile *sf);
|
||||
int32_t scriptfile_getbraces(scriptfile *sf, FScanner::SavedPos *braceend);
|
||||
|
||||
using scriptfile = FScanner;
|
||||
|
||||
|
||||
inline int32_t scriptfile_getnumber(scriptfile *sf, int32_t *num)
|
||||
{
|
||||
bool res = sf->GetNumber();
|
||||
if (res) *num = sf->Number;
|
||||
else *num = 0;
|
||||
return !res;
|
||||
}
|
||||
|
||||
inline int32_t scriptfile_getdouble(scriptfile *sf, double *num)
|
||||
{
|
||||
bool res = sf->GetFloat();
|
||||
if (res) *num = sf->Float;
|
||||
else *num = 0;
|
||||
return !res;
|
||||
}
|
||||
|
||||
inline int32_t scriptfile_getstring(scriptfile *sf, FString *st)
|
||||
{
|
||||
bool res = sf->GetString();
|
||||
if (res) *st = sf->String;
|
||||
else *st = "";
|
||||
return !res;
|
||||
}
|
||||
|
||||
inline int32_t scriptfile_getsymbol(scriptfile *sf, int32_t *num)
|
||||
{
|
||||
bool res = sf->GetNumber(true);
|
||||
if (res) *num = sf->Number;
|
||||
else *num = 0;
|
||||
return !res;
|
||||
}
|
||||
|
||||
inline FScriptPosition scriptfile_getposition(scriptfile *sf)
|
||||
{
|
||||
return FScriptPosition(*sf);
|
||||
}
|
||||
|
||||
inline int32_t scriptfile_getbraces(scriptfile *sf, FScanner::SavedPos *braceend)
|
||||
{
|
||||
if (sf->CheckString("{"))
|
||||
{
|
||||
auto here = sf->SavePos();
|
||||
sf->SkipToEndOfBlock();
|
||||
*braceend = sf->SavePos();
|
||||
sf->RestorePos(here);
|
||||
return 0;
|
||||
}
|
||||
else
|
||||
{
|
||||
sf->ScriptError("'{' expected");
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
inline bool scriptfile_endofblock(scriptfile* sf, FScanner::SavedPos& braceend)
|
||||
{
|
||||
return sf->textptr >= braceend.SavedScriptPtr;
|
||||
auto here = sf->SavePos();
|
||||
return here.SavedScriptPtr >= braceend.SavedScriptPtr;
|
||||
}
|
||||
void scriptfile_setposition(scriptfile* sf, const FScanner::SavedPos& pos);
|
||||
|
||||
scriptfile *scriptfile_fromfile(const char *fn);
|
||||
void scriptfile_close(scriptfile *sf);
|
||||
int scriptfile_eof(scriptfile *sf);
|
||||
inline void scriptfile_setposition(scriptfile* sf, const FScanner::SavedPos& pos)
|
||||
{
|
||||
sf->RestorePos(pos);
|
||||
}
|
||||
|
||||
int32_t scriptfile_getsymbolvalue(char const *name, int32_t *val);
|
||||
int32_t scriptfile_addsymbolvalue(char const *name, int32_t val);
|
||||
void scriptfile_clearsymbols(void);
|
||||
inline scriptfile *scriptfile_fromfile(const char *fn)
|
||||
{
|
||||
int lump = fileSystem.FindFile(fn);
|
||||
if (lump < 0) return nullptr;
|
||||
auto sc = new FScanner;
|
||||
sc->OpenLumpNum(lump);
|
||||
sc->SetNoOctals(true);
|
||||
sc->SetNoFatalErrors(true);
|
||||
return sc;
|
||||
}
|
||||
|
||||
inline void scriptfile_close(scriptfile *sf)
|
||||
{
|
||||
delete sf;
|
||||
}
|
||||
|
||||
inline int32_t scriptfile_addsymbolvalue(scriptfile *sf, char const *name, int32_t val)
|
||||
{
|
||||
sf->AddSymbol(name, val);
|
||||
return 1;
|
||||
}
|
||||
|
||||
typedef struct
|
||||
{
|
||||
|
|
@ -51,7 +110,4 @@ enum
|
|||
T_ERROR = -1,
|
||||
};
|
||||
|
||||
|
||||
int32_t getatoken(scriptfile *sf, const tokenlist *tl, int32_t ntokens);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -18,6 +18,22 @@
|
|||
#include "palettecontainer.h"
|
||||
#include "mapinfo.h"
|
||||
|
||||
|
||||
int32_t getatoken(scriptfile *sf, const tokenlist *tl, int32_t ntokens)
|
||||
{
|
||||
int32_t i;
|
||||
|
||||
if (!sf) return T_ERROR;
|
||||
if (!sf->GetString()) return T_EOF;
|
||||
|
||||
for (i=ntokens-1; i>=0; i--)
|
||||
{
|
||||
if (sf->Compare(tl[i].text))
|
||||
return tl[i].tokenid;
|
||||
}
|
||||
return T_ERROR;
|
||||
}
|
||||
|
||||
void AddUserMapHack(usermaphack_t&);
|
||||
#if 0
|
||||
// For later
|
||||
|
|
@ -201,7 +217,7 @@ static const char *skyfaces[6] =
|
|||
|
||||
static int32_t defsparser(scriptfile *script);
|
||||
|
||||
static void defsparser_include(const char *fn, const scriptfile *script, FScriptPosition *pos)
|
||||
static void defsparser_include(const char *fn, scriptfile *script, FScriptPosition *pos)
|
||||
{
|
||||
scriptfile *included;
|
||||
|
||||
|
|
@ -215,12 +231,9 @@ static void defsparser_include(const char *fn, const scriptfile *script, FScript
|
|||
}
|
||||
else
|
||||
{
|
||||
if (!pos)
|
||||
{
|
||||
Printf("Loading module \"%s\"\n",fn);
|
||||
}
|
||||
|
||||
if (script) included->symbols = std::move(script->symbols);
|
||||
defsparser(included);
|
||||
if (script) script->symbols = std::move(included->symbols);
|
||||
scriptfile_close(included);
|
||||
}
|
||||
}
|
||||
|
|
@ -384,7 +397,7 @@ static int32_t defsparser(scriptfile *script)
|
|||
if (scriptfile_getstring(script,&name)) break;
|
||||
if (scriptfile_getsymbol(script,&number)) break;
|
||||
|
||||
if (scriptfile_addsymbolvalue(name,number) < 0)
|
||||
if (scriptfile_addsymbolvalue(script, name,number) < 0)
|
||||
pos.Message(MSG_WARNING, "Warning: Symbol %s was NOT redefined to %d", name.GetChars(),number);
|
||||
break;
|
||||
}
|
||||
|
|
@ -3353,13 +3366,14 @@ int32_t loaddefinitionsfile(const char *fn)
|
|||
}
|
||||
|
||||
if (userConfig.AddDefs) for (auto& m : *userConfig.AddDefs)
|
||||
defsparser_include(m, NULL, NULL);
|
||||
{
|
||||
Printf("Loading module \"%s\"\n",m.GetChars());
|
||||
defsparser_include(m, NULL, NULL); // Q: should we let the external script see our symbol table?
|
||||
}
|
||||
|
||||
if (script)
|
||||
scriptfile_close(script);
|
||||
|
||||
scriptfile_clearsymbols();
|
||||
|
||||
DO_FREE_AND_NULL(faketilebuffer);
|
||||
faketilebuffersiz = 0;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,455 +0,0 @@
|
|||
/*
|
||||
* File Tokeniser/Parser/Whatever
|
||||
* by Jonathon Fowler
|
||||
* Remixed completely by Ken Silverman
|
||||
* See the included license file "BUILDLIC.TXT" for license info.
|
||||
*/
|
||||
|
||||
#include "compat.h"
|
||||
#include "scriptfile.h"
|
||||
#include "compat.h"
|
||||
#include "filesystem.h"
|
||||
#include "printf.h"
|
||||
|
||||
|
||||
#define ISWS(x) ((x == ' ') || (x == '\t') || (x == '\r') || (x == '\n'))
|
||||
static inline void skipoverws(scriptfile *sf) { if ((sf->textptr < sf->eof) && (!sf->textptr[0])) sf->textptr++; }
|
||||
static inline void skipovertoken(scriptfile *sf) { while ((sf->textptr < sf->eof) && (sf->textptr[0])) sf->textptr++; }
|
||||
|
||||
char *scriptfile_gettoken(scriptfile *sf)
|
||||
{
|
||||
if (scriptfile_eof(sf)) return NULL;
|
||||
|
||||
char *start = sf->ltextptr = sf->textptr;
|
||||
skipovertoken(sf);
|
||||
return start;
|
||||
}
|
||||
|
||||
|
||||
static int scriptfile_eof_error(scriptfile *sf)
|
||||
{
|
||||
if (scriptfile_eof(sf))
|
||||
{
|
||||
Printf("Error on line %s:%d: unexpected eof\n", sf->filename, scriptfile_getlinum(sf, sf->textptr));
|
||||
return -1;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int32_t scriptfile_getstring(scriptfile *sf, FString *retst)
|
||||
{
|
||||
auto p = scriptfile_gettoken(sf);
|
||||
if (p == NULL)
|
||||
{
|
||||
Printf("Error on line %s:%d: unexpected eof\n",sf->filename,scriptfile_getlinum(sf,sf->textptr));
|
||||
return -2;
|
||||
}
|
||||
if (retst) *retst = p;
|
||||
return 0;
|
||||
}
|
||||
|
||||
int32_t scriptfile_getnumber(scriptfile *sf, int32_t *num)
|
||||
{
|
||||
if (scriptfile_eof_error(sf)) return -1;
|
||||
|
||||
while ((sf->textptr[0] == '0') && isdigit(sf->textptr[1]))
|
||||
sf->textptr++; //hack to treat octal numbers like decimal
|
||||
|
||||
sf->ltextptr = sf->textptr;
|
||||
(*num) = (int)strtoll((const char *)sf->textptr,&sf->textptr,0);
|
||||
if (!ISWS(*sf->textptr) && *sf->textptr)
|
||||
{
|
||||
char *p = sf->textptr;
|
||||
skipovertoken(sf);
|
||||
Printf("Error on line %s:%d: expecting int, got \"%s\"\n",sf->filename,scriptfile_getlinum(sf,sf->ltextptr),p);
|
||||
return -2;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
static double parsedouble(char *ptr, char **end)
|
||||
{
|
||||
int32_t beforedecimal = 1, negative = 0, dig;
|
||||
int32_t exposgn = 0, expo = 0;
|
||||
double num = 0.0, decpl = 0.1;
|
||||
char *p;
|
||||
|
||||
p = ptr;
|
||||
if (*p == '-') negative = 1, p++;
|
||||
else if (*p == '+') p++;
|
||||
for (;; p++)
|
||||
{
|
||||
if (isdigit(*p))
|
||||
{
|
||||
dig = *p - '0';
|
||||
if (beforedecimal) num = num * 10.0 + dig;
|
||||
else if (exposgn) expo = expo*10 + dig;
|
||||
else
|
||||
{
|
||||
num += (double)dig * decpl;
|
||||
decpl /= 10.0;
|
||||
}
|
||||
}
|
||||
else if (*p == '.')
|
||||
{
|
||||
if (beforedecimal) beforedecimal = 0;
|
||||
else break;
|
||||
}
|
||||
else if ((*p == 'E') || (*p == 'e'))
|
||||
{
|
||||
exposgn = 1;
|
||||
if (p[1] == '-') { exposgn = -1; p++; }
|
||||
else if (p[1] == '+') p++;
|
||||
}
|
||||
else break;
|
||||
}
|
||||
|
||||
if (end) *end = p;
|
||||
if (exposgn) num *= pow(10.0,(double)(expo*exposgn));
|
||||
return negative ? -num : num;
|
||||
}
|
||||
|
||||
int32_t scriptfile_getdouble(scriptfile *sf, double *num)
|
||||
{
|
||||
if (scriptfile_eof_error(sf))
|
||||
return -1;
|
||||
|
||||
sf->ltextptr = sf->textptr;
|
||||
|
||||
// On Linux, locale settings interfere with interpreting x.y format numbers
|
||||
//(*num) = strtod((const char *)sf->textptr,&sf->textptr);
|
||||
(*num) = parsedouble(sf->textptr, &sf->textptr);
|
||||
|
||||
if (!ISWS(*sf->textptr) && *sf->textptr)
|
||||
{
|
||||
char *p = sf->textptr;
|
||||
skipovertoken(sf);
|
||||
Printf("Error on line %s:%d: expecting float, got \"%s\"\n",sf->filename,scriptfile_getlinum(sf,sf->ltextptr),p);
|
||||
return -2;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
int scriptfile_getsymbol(scriptfile *sf, int32_t *num)
|
||||
{
|
||||
char *t = scriptfile_gettoken(sf);
|
||||
if (!t) return -1;
|
||||
|
||||
char * e;
|
||||
int32_t v = (int)strtoll(t, &e, 10); // beware of overflows! strtol can have quite unexpected behavior!.
|
||||
|
||||
if (*e)
|
||||
{
|
||||
// looks like a string, so find it in the symbol table
|
||||
if (scriptfile_getsymbolvalue(t, num)) return 0;
|
||||
Printf("Error on line %s:%d: expecting symbol, got \"%s\"\n", sf->filename, scriptfile_getlinum(sf, sf->ltextptr), t);
|
||||
return -2;
|
||||
}
|
||||
|
||||
*num = v;
|
||||
return 0;
|
||||
}
|
||||
|
||||
FScriptPosition scriptfile_getposition(const scriptfile *sf)
|
||||
{
|
||||
FScriptPosition pos;
|
||||
|
||||
pos.FileName = sf->filename;
|
||||
pos.ScriptLine = scriptfile_getlinum(sf, sf->ltextptr);
|
||||
return pos;
|
||||
}
|
||||
|
||||
int32_t scriptfile_getbraces(scriptfile *sf, FScanner::SavedPos *braceend)
|
||||
{
|
||||
if (scriptfile_eof_error(sf))
|
||||
return -1;
|
||||
|
||||
if (sf->textptr[0] != '{')
|
||||
{
|
||||
Printf("Error on line %s:%d: expecting '{'\n",sf->filename,scriptfile_getlinum(sf,sf->textptr));
|
||||
return -1;
|
||||
}
|
||||
|
||||
char *bracestart = ++sf->textptr;
|
||||
int bracecnt = 1;
|
||||
|
||||
do
|
||||
{
|
||||
if (sf->textptr >= sf->eof)
|
||||
return 0;
|
||||
else if (sf->textptr[0] == '{')
|
||||
bracecnt++;
|
||||
else if (sf->textptr[0] == '}')
|
||||
if (!(--bracecnt))
|
||||
break;
|
||||
sf->textptr++;
|
||||
} while (1);
|
||||
|
||||
braceend->SavedScriptPtr = sf->textptr;
|
||||
sf->textptr = bracestart;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void scriptfile_setposition(scriptfile* sf, const FScanner::SavedPos& pos)
|
||||
{
|
||||
sf->textptr = const_cast<char*>(pos.SavedScriptPtr+1);
|
||||
}
|
||||
|
||||
|
||||
int32_t scriptfile_getlinum(const scriptfile *sf, const char *ptr)
|
||||
{
|
||||
int32_t i, stp;
|
||||
intptr_t ind;
|
||||
|
||||
//for(i=0;i<sf->linenum;i++) if (sf->lineoffs[i] >= ind) return i+1; //brute force algo
|
||||
|
||||
ind = ((intptr_t)ptr) - ((intptr_t)sf->textbuf);
|
||||
|
||||
for (stp=1; stp+stp<sf->linenum; stp+=stp) { } //stp = highest power of 2 less than sf->linenum
|
||||
for (i=0; stp; stp>>=1)
|
||||
if ((i+stp-1 < sf->linenum) && (sf->lineoffs[i+stp-1] < ind)) i += stp;
|
||||
return i+1; //i = index to highest lineoffs which is less than ind; convert to 1-based line numbers
|
||||
}
|
||||
|
||||
void scriptfile_preparse(scriptfile *sf, char *tx, int32_t flen)
|
||||
{
|
||||
int32_t i, cr, numcr, nflen, ws, cs, inquote;
|
||||
|
||||
//Count number of lines
|
||||
numcr = 1;
|
||||
for (i=0; i<flen; i++)
|
||||
{
|
||||
//detect all 4 types of carriage return (\r, \n, \r\n, \n\r :)
|
||||
cr = 0;
|
||||
if (tx[i] == '\r')
|
||||
{
|
||||
i += (tx[i + 1] == '\n');
|
||||
cr = 1;
|
||||
}
|
||||
else if (tx[i] == '\n')
|
||||
{
|
||||
i += (tx[i + 1] == '\r');
|
||||
cr = 1;
|
||||
}
|
||||
if (cr)
|
||||
{
|
||||
numcr++;
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
sf->linenum = numcr;
|
||||
sf->lineoffs = (int32_t *)Xmalloc(sf->linenum*sizeof(int32_t));
|
||||
|
||||
//Preprocess file for comments (// and /*...*/, and convert all whitespace to single spaces)
|
||||
nflen = 0; ws = 0; cs = 0; numcr = 0; inquote = 0;
|
||||
for (i=0; i<flen; i++)
|
||||
{
|
||||
//detect all 4 types of carriage return (\r, \n, \r\n, \n\r :)
|
||||
cr = 0;
|
||||
if (tx[i] == '\r')
|
||||
{
|
||||
i += (tx[i + 1] == '\n');
|
||||
cr = 1;
|
||||
}
|
||||
else if (tx[i] == '\n')
|
||||
{
|
||||
i += (tx[i + 1] == '\r');
|
||||
cr = 1;
|
||||
}
|
||||
if (cr)
|
||||
{
|
||||
//Remember line numbers by storing the byte index at the start of each line
|
||||
//Line numbers can be retrieved by doing a binary search on the byte index :)
|
||||
sf->lineoffs[numcr++] = nflen;
|
||||
if (cs == 1) cs = 0;
|
||||
ws = 1; continue; //strip CR/LF
|
||||
}
|
||||
|
||||
if ((!inquote) && ((tx[i] == ' ') || (tx[i] == '\t')))
|
||||
{
|
||||
ws = 1;
|
||||
continue;
|
||||
} // strip Space/Tab
|
||||
if ((tx[i] == '/') && (tx[i + 1] == '/') && (!cs))
|
||||
cs = 1;
|
||||
if ((tx[i] == '/') && (tx[i + 1] == '*') && (!cs))
|
||||
{
|
||||
ws = 1;
|
||||
cs = 2;
|
||||
}
|
||||
if ((tx[i] == '*') && (tx[i + 1] == '/') && (cs == 2))
|
||||
{
|
||||
cs = 0;
|
||||
i++;
|
||||
continue;
|
||||
}
|
||||
if (cs)
|
||||
continue;
|
||||
|
||||
if (ws)
|
||||
tx[nflen++] = ws = 0;
|
||||
|
||||
//quotes inside strings: \"
|
||||
if ((tx[i] == '\\') && (tx[i+1] == '\"')) { i++; tx[nflen++] = '\"'; continue; }
|
||||
if (tx[i] == '\"') { inquote ^= 1; continue; }
|
||||
tx[nflen++] = tx[i];
|
||||
}
|
||||
tx[nflen++] = 0; sf->lineoffs[numcr] = nflen;
|
||||
tx[nflen++] = 0;
|
||||
|
||||
#if 0
|
||||
//for debugging only:
|
||||
printf("pre-parsed file:flen=%d,nflen=%d\n",flen,nflen);
|
||||
for (i=0; i<nflen; i++) { if (tx[i] < 32) printf("_"); else printf("%c",tx[i]); }
|
||||
printf("[eof]\nnumlines=%d\n",sf->linenum);
|
||||
for (i=0; i<sf->linenum; i++) printf("line %d = byte %d\n",i,sf->lineoffs[i]);
|
||||
#endif
|
||||
|
||||
sf->textbuf = sf->textptr = tx;
|
||||
sf->textlength = nflen;
|
||||
sf->eof = &sf->textbuf[nflen-1];
|
||||
}
|
||||
|
||||
scriptfile *scriptfile_fromfile(const char *fn)
|
||||
{
|
||||
auto fr = fileSystem.OpenFileReader(fn);
|
||||
if (!fr.isOpen()) return nullptr;
|
||||
|
||||
uint32_t flen = fr.GetLength();
|
||||
char * tx = (char *)Xmalloc(flen + 2);
|
||||
|
||||
scriptfile *sf = (scriptfile *)Xmalloc(sizeof(scriptfile));
|
||||
|
||||
fr.Read(tx, flen);
|
||||
|
||||
tx[flen] = tx[flen+1] = 0;
|
||||
|
||||
scriptfile_preparse(sf,tx,flen);
|
||||
sf->filename = Xstrdup(fn);
|
||||
|
||||
return sf;
|
||||
}
|
||||
|
||||
void scriptfile_close(scriptfile *sf)
|
||||
{
|
||||
if (!sf) return;
|
||||
Xfree(sf->lineoffs);
|
||||
Xfree(sf->textbuf);
|
||||
Xfree(sf->filename);
|
||||
Xfree(sf);
|
||||
}
|
||||
|
||||
int scriptfile_eof(scriptfile *sf)
|
||||
{
|
||||
skipoverws(sf);
|
||||
return !!(sf->textptr >= sf->eof);
|
||||
}
|
||||
|
||||
#define SYMBTABSTARTSIZE 256
|
||||
static int32_t symbtablength=0, symbtaballoclength=0;
|
||||
static char *symbtab = NULL;
|
||||
|
||||
static char *getsymbtabspace(int32_t reqd)
|
||||
{
|
||||
char *pos,*np;
|
||||
int32_t i;
|
||||
|
||||
if (symbtablength + reqd > symbtaballoclength)
|
||||
{
|
||||
for (i=max(symbtaballoclength,SYMBTABSTARTSIZE); symbtablength+reqd>i; i<<=1) { }
|
||||
np = (char *)Xrealloc(symbtab, i);
|
||||
symbtab = np; symbtaballoclength = i;
|
||||
}
|
||||
|
||||
pos = &symbtab[symbtablength];
|
||||
symbtablength += reqd;
|
||||
return pos;
|
||||
}
|
||||
|
||||
int32_t scriptfile_getsymbolvalue(char const *name, int32_t *val)
|
||||
{
|
||||
if (strlen(name) > 2)
|
||||
{
|
||||
if (name[0] == '0' && tolower(name[1]) == 'x') // hex constants
|
||||
{
|
||||
uint64_t x;
|
||||
sscanf(name + 2, "%" PRIx64 "", &x);
|
||||
|
||||
if (x > UINT32_MAX)
|
||||
Printf("warning: number 0x%" PRIx64 " truncated to 32 bits.\n", x);
|
||||
|
||||
*val = x;
|
||||
return 1;
|
||||
}
|
||||
}
|
||||
char *scanner = symbtab;
|
||||
|
||||
if (!symbtab) return 0;
|
||||
while (scanner - symbtab < symbtablength)
|
||||
{
|
||||
if (!stricmp(name, scanner))
|
||||
{
|
||||
*val = B_UNBUF32(scanner + strlen(scanner) + 1);
|
||||
return 1;
|
||||
}
|
||||
|
||||
scanner += strlen(scanner) + 1 + sizeof(int32_t);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
int32_t scriptfile_addsymbolvalue(char const *name, int32_t val)
|
||||
{
|
||||
char *sp;
|
||||
// if (scriptfile_getsymbolvalue(name, &x)) return -1; // already exists
|
||||
|
||||
if (symbtab)
|
||||
{
|
||||
char *scanner = symbtab;
|
||||
while (scanner - symbtab < symbtablength)
|
||||
{
|
||||
if (!stricmp(name, scanner))
|
||||
{
|
||||
B_BUF32(scanner + strlen(scanner) + 1, val);
|
||||
return 1;
|
||||
}
|
||||
|
||||
scanner += strlen(scanner) + 1 + sizeof(int32_t);
|
||||
}
|
||||
}
|
||||
|
||||
sp = getsymbtabspace(strlen(name) + 1 + sizeof(int32_t));
|
||||
if (!sp) return 0;
|
||||
strcpy(sp, name);
|
||||
sp += strlen(name)+1;
|
||||
B_BUF32(sp, val);
|
||||
return 1; // added
|
||||
}
|
||||
|
||||
void scriptfile_clearsymbols(void)
|
||||
{
|
||||
DO_FREE_AND_NULL(symbtab);
|
||||
symbtablength = 0;
|
||||
symbtaballoclength = 0;
|
||||
}
|
||||
|
||||
int32_t getatoken(scriptfile *sf, const tokenlist *tl, int32_t ntokens)
|
||||
{
|
||||
char *tok;
|
||||
int32_t i;
|
||||
|
||||
if (!sf) return T_ERROR;
|
||||
tok = scriptfile_gettoken(sf);
|
||||
if (!tok) return T_EOF;
|
||||
|
||||
for (i=ntokens-1; i>=0; i--)
|
||||
{
|
||||
if (!stricmp(tok, tl[i].text))
|
||||
return tl[i].tokenid;
|
||||
}
|
||||
return T_ERROR;
|
||||
}
|
||||
|
||||
|
|
@ -755,6 +755,7 @@ bool FScanner::GetNumber (bool evaluate)
|
|||
|
||||
}
|
||||
ScriptError ("SC_GetNumber: Bad numeric constant \"%s\".", String);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
Float = Number;
|
||||
|
|
@ -916,6 +917,7 @@ bool FScanner::GetFloat (bool evaluate)
|
|||
}
|
||||
|
||||
ScriptError ("SC_GetFloat: Bad numeric constant \"%s\".", String);
|
||||
return false;
|
||||
}
|
||||
Number = (int)Float;
|
||||
return true;
|
||||
|
|
@ -1260,9 +1262,9 @@ void FScanner::SkipToEndOfBlock()
|
|||
int depth = 0;
|
||||
while (1)
|
||||
{
|
||||
MustGetAnyToken(); // this will abort if it reaches the end of the file
|
||||
if (TokenType == '}') depth++;
|
||||
else if (TokenType == '}')
|
||||
MustGetString(); // this will abort if it reaches the end of the file
|
||||
if (Compare("{")) depth++;
|
||||
else if (Compare("}"))
|
||||
{
|
||||
depth--;
|
||||
if (depth < 0) return;
|
||||
|
|
|
|||
Loading…
Reference in a new issue