- Renamed FxSequence to FxCompoundStatement.

- fixed: The state parser was unable to accept empty anonymous functions, which should be treated as if there is none at all.
This commit is contained in:
Christoph Oelckers 2016-10-19 16:15:02 +02:00
commit 8a6230d64a
5 changed files with 17 additions and 13 deletions

View file

@ -5016,11 +5016,11 @@ ExpEmit FxFlopFunctionCall::Emit(VMFunctionBuilder *build)
//==========================================================================
//
// FxSequence :: Resolve
// FxCompoundStatement :: Resolve
//
//==========================================================================
FxExpression *FxSequence::Resolve(FCompileContext &ctx)
FxExpression *FxCompoundStatement::Resolve(FCompileContext &ctx)
{
CHECKRESOLVED();
for (unsigned i = 0; i < Expressions.Size(); ++i)
@ -5036,11 +5036,11 @@ FxExpression *FxSequence::Resolve(FCompileContext &ctx)
//==========================================================================
//
// FxSequence :: Emit
// FxCompoundStatement :: Emit
//
//==========================================================================
ExpEmit FxSequence::Emit(VMFunctionBuilder *build)
ExpEmit FxCompoundStatement::Emit(VMFunctionBuilder *build)
{
for (unsigned i = 0; i < Expressions.Size(); ++i)
{
@ -5053,11 +5053,11 @@ ExpEmit FxSequence::Emit(VMFunctionBuilder *build)
//==========================================================================
//
// FxSequence :: GetDirectFunction
// FxCompoundStatement :: GetDirectFunction
//
//==========================================================================
VMFunction *FxSequence::GetDirectFunction()
VMFunction *FxCompoundStatement::GetDirectFunction()
{
if (Expressions.Size() == 1)
{

View file

@ -1079,16 +1079,16 @@ public:
//==========================================================================
//
// FxSequence
// FxCompoundStatement
//
//==========================================================================
class FxSequence : public FxExpression
class FxCompoundStatement : public FxExpression
{
TDeletingArray<FxExpression *> Expressions;
public:
FxSequence(const FScriptPosition &pos) : FxExpression(pos) {}
FxCompoundStatement(const FScriptPosition &pos) : FxExpression(pos) {}
FxExpression *Resolve(FCompileContext&);
ExpEmit Emit(VMFunctionBuilder *build);
void Add(FxExpression *expr) { if (expr != NULL) Expressions.Push(expr); }