zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 23:32:02 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove isconst from FCompileContext.

Browse source 
- It's not used anymore, so keeping it around is pointless.
This commit is contained in:
Randy Heit 2013-08-02 21:09:49 -05:00
parent 58f088c1ab
commit 09c902ce55
2 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/thingdef/thingdef_exp.h
View file

@ -62,13 +62,11 @@ struct FCompileContext
{ {
PClassActor *cls; PClassActor *cls;
bool lax; bool lax;
bool isconst;
FCompileContext(PClassActor *_cls = NULL, bool _lax = false, bool _isconst = false) FCompileContext(PClassActor *_cls = NULL, bool _lax = false)
{ {
cls = _cls; cls = _cls;
lax = _lax; lax = _lax;
isconst = _isconst;
} }
PSymbol *FindInClass(FName identifier) PSymbol *FindInClass(FName identifier)

8
src/thingdef/thingdef_parse.cpp
View file

@ -208,7 +208,7 @@ static void ParseConstant (FScanner &sc, PSymbolTable *symt, PClassActor *cls)
FxExpression *expr = ParseExpression (sc, cls); FxExpression *expr = ParseExpression (sc, cls);
sc.MustGetToken(';'); sc.MustGetToken(';');
FCompileContext ctx(cls, true, true); FCompileContext ctx(cls, true);
expr = expr->Resolve(ctx); expr = expr->Resolve(ctx);
if (!expr->isConstant()) if (!expr->isConstant())
{ {
@ -266,7 +266,7 @@ static void ParseEnum (FScanner &sc, PSymbolTable *symt, PClassActor *cls)
if (sc.CheckToken('=')) if (sc.CheckToken('='))
{ {
FxExpression *expr = ParseExpression (sc, cls); FxExpression *expr = ParseExpression (sc, cls);
FCompileContext ctx(cls, true, true); FCompileContext ctx(cls, true);
expr = expr->Resolve(ctx); expr = expr->Resolve(ctx);
if (!expr->isConstant()) if (!expr->isConstant())
{ {
@ -355,7 +355,7 @@ static void ParseNativeVariable (FScanner &sc, PSymbolTable *symt, PClassActor *
if (sc.CheckToken('[')) if (sc.CheckToken('['))
{ {
FxExpression *expr = ParseExpression (sc, cls); FxExpression *expr = ParseExpression (sc, cls);
FCompileContext ctx(cls, true, true); FCompileContext ctx(cls, true);
expr = expr->Resolve(ctx); expr = expr->Resolve(ctx);
if (!expr->isConstant()) if (!expr->isConstant())
{ {
@ -428,7 +428,7 @@ static void ParseUserVariable (FScanner &sc, PSymbolTable *symt, PClassActor *cl
if (sc.CheckToken('[')) if (sc.CheckToken('['))
{ {
FxExpression *expr = ParseExpression(sc, cls); FxExpression *expr = ParseExpression(sc, cls);
FCompileContext ctx(cls, true, true); FCompileContext ctx(cls, true);
int maxelems; int maxelems;
expr = expr->Resolve(ctx); expr = expr->Resolve(ctx);
if (!expr->isConstant()) if (!expr->isConstant())