Macintosh-Tools/Retro68
1
0
Fork 0
mirror of https://github.com/autc04/Retro68.git synced 2024-06-08 04:29:46 +00:00
Code Issues Projects Releases Wiki Activity

Rez: IdentifierExpr: strings and subscripts

Browse Source
This commit is contained in:
Wolfgang Thaller 2014-10-08 01:37:51 +02:00
parent 50eb0f5373
commit 340db62480
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Rez/Expression.cc
View File

@ -130,12 +130,26 @@ int IdentifierExpr::evaluateInt(ResourceCompiler *ctx)
}
else
{
ExprPtr val = ctx->lookupIdentifier(id);
Subscripts sub;
for(auto arg : arguments)
sub.addSubscript(arg->evaluateInt(ctx));
ExprPtr val = ctx->lookupIdentifier(id, sub);
assert(val);
return val->evaluateInt(ctx);
}
}
std::string IdentifierExpr::evaluateString(ResourceCompiler *ctx)
{
assert(!isFunction);
Subscripts sub;
for(auto arg : arguments)
sub.addSubscript(arg->evaluateInt(ctx));
ExprPtr val = ctx->lookupIdentifier(id, sub);
assert(val);
return val->evaluateString(ctx);
}
CaseExpr::CaseExpr(const std::string &tag, CompoundExprPtr expr)
: tag(tag), expr(expr)

1
Rez/Expression.h
View File

@ -111,6 +111,7 @@ public:
void addArgument(ExprPtr e);
virtual int evaluateInt(ResourceCompiler *ctx);
virtual std::string evaluateString(ResourceCompiler *ctx);
};
#endif // EXPRESSION_H