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

Remove redundant Resolves

Browse source 
- ParseExpression() calls Resolve() on the FxExpression before returing
  it, so there's no need to immediately Resolve() what it returns.
This commit is contained in:
Randy Heit 2013-08-02 21:19:05 -05:00
parent 4f528e3832
commit 5cc8a9c2a7
1 changed files with 0 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/thingdef/thingdef_parse.cpp
View file

@ -208,8 +208,6 @@ 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);
expr = expr->Resolve(ctx);
if (!expr->isConstant()) if (!expr->isConstant())
{ {
sc.ScriptMessage("Constant definition is not a constant"); sc.ScriptMessage("Constant definition is not a constant");
@ -266,8 +264,6 @@ 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);
expr = expr->Resolve(ctx);
if (!expr->isConstant()) if (!expr->isConstant())
{ {
sc.ScriptMessage("'%s' must be constant", symname.GetChars()); sc.ScriptMessage("'%s' must be constant", symname.GetChars());
@ -355,8 +351,6 @@ 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);
expr = expr->Resolve(ctx);
if (!expr->isConstant()) if (!expr->isConstant())
{ {
sc.ScriptError("Array size must be constant"); sc.ScriptError("Array size must be constant");
@ -428,9 +422,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);
int maxelems; int maxelems;
expr = expr->Resolve(ctx);
if (!expr->isConstant()) if (!expr->isConstant())
{ {
sc.ScriptMessage("Array size must be a constant"); sc.ScriptMessage("Array size must be a constant");