zdoom/qzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/qzdoom.git synced 2025-01-18 23:21:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: The evaluation of multi-string ZScript properties did not work correctly.

Browse source
This commit is contained in:
Christoph Oelckers 2017-03-18 14:04:28 +01:00
parent cb5ddeff25
commit 74e9d9db1a
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/scripting/zscript/zcc_compile.cpp
View file

@ -64,11 +64,13 @@ static double GetFloatConst(FxExpression *ex, FCompileContext &ctx)
return ex ? static_cast<FxConstant*>(ex)->GetValue().GetFloat() : 0; return ex ? static_cast<FxConstant*>(ex)->GetValue().GetFloat() : 0;
} }
static FString GetStringConst(FxExpression *ex, FCompileContext &ctx) const char * ZCCCompiler::GetStringConst(FxExpression *ex, FCompileContext &ctx)
{ {
ex = new FxStringCast(ex); ex = new FxStringCast(ex);
ex = ex->Resolve(ctx); ex = ex->Resolve(ctx);
return ex ? static_cast<FxConstant*>(ex)->GetValue().GetString() : FString(); if (!ex) return "";
// The string here must be stored in a persistent place that lasts long enough to have it processed.
return AST.Strings.Alloc(static_cast<FxConstant*>(ex)->GetValue().GetString())->GetChars();
} }
int ZCCCompiler::IntConstFromNode(ZCC_TreeNode *node, PStruct *cls) int ZCCCompiler::IntConstFromNode(ZCC_TreeNode *node, PStruct *cls)
@ -1851,6 +1853,12 @@ void ZCCCompiler::DispatchProperty(FPropertyInfo *prop, ZCC_PropertyStmt *proper
params[0].i++; params[0].i++;
} }
exp = static_cast<ZCC_Expression *>(exp->SiblingNext); exp = static_cast<ZCC_Expression *>(exp->SiblingNext);
if (exp != property->Values)
{
ex = ConvertNode(exp);
ex = ex->Resolve(ctx);
if (ex == nullptr) return;
}
} while (exp != property->Values); } while (exp != property->Values);
goto endofparm; goto endofparm;
} }
@ -1988,7 +1996,7 @@ void ZCCCompiler::DispatchScriptProperty(PProperty *prop, ZCC_PropertyStmt *prop
} }
else if (f->Type == TypeColor && ex->ValueType == TypeString) // colors can also be specified as ints. else if (f->Type == TypeColor && ex->ValueType == TypeString) // colors can also be specified as ints.
{ {
*(PalEntry*)addr = V_GetColor(nullptr, GetStringConst(ex, ctx).GetChars(), &ex->ScriptPosition); *(PalEntry*)addr = V_GetColor(nullptr, GetStringConst(ex, ctx), &ex->ScriptPosition);
} }
else if (f->Type->IsKindOf(RUNTIME_CLASS(PInt))) else if (f->Type->IsKindOf(RUNTIME_CLASS(PInt)))
{ {
@ -2012,7 +2020,7 @@ void ZCCCompiler::DispatchScriptProperty(PProperty *prop, ZCC_PropertyStmt *prop
} }
else if (!cls->IsDescendantOf(static_cast<PClassPointer*>(f->Type)->ClassRestriction)) else if (!cls->IsDescendantOf(static_cast<PClassPointer*>(f->Type)->ClassRestriction))
{ {
Error(property, "class %s is not compatible with property type %s", clsname.GetChars(), static_cast<PClassPointer*>(f->Type)->ClassRestriction->TypeName.GetChars()); Error(property, "class %s is not compatible with property type %s", clsname, static_cast<PClassPointer*>(f->Type)->ClassRestriction->TypeName.GetChars());
} }
*(PClass**)addr = cls; *(PClass**)addr = cls;
} }

2
src/scripting/zscript/zcc_compile.h
View file

@ -92,6 +92,8 @@ public:
int Compile(); int Compile();
private: private:
const char * GetStringConst(FxExpression *ex, FCompileContext &ctx);
int IntConstFromNode(ZCC_TreeNode *node, PStruct *cls); int IntConstFromNode(ZCC_TreeNode *node, PStruct *cls);
FString StringConstFromNode(ZCC_TreeNode *node, PStruct *cls); FString StringConstFromNode(ZCC_TreeNode *node, PStruct *cls);
void ProcessClass(ZCC_Class *node, PSymbolTreeNode *tnode); void ProcessClass(ZCC_Class *node, PSymbolTreeNode *tnode);