OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Fixed some issues in the ZScript array compilation code.

Browse source
This commit is contained in:
Chronos Ouroboros 2019-01-06 19:57:36 -02:00 • committed by Christoph Oelckers
commit 7c91b27463
3 changed files with 61 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3559,10 +3559,13 @@ FxExpression *ZCCCompiler::ConvertNode(ZCC_TreeNode *ast)
if (node->InitIsArray)
{
if (static_cast<PArray *>(type)->ElementType->isArray ())
{
Error(node, "Compound initializer not implemented yet for multi-dimensional arrays");
}
FArgumentList args;
ConvertNodeList(args, node->Init);
// This has to let the code generator resolve the constants, not the Simplifier, which lacks all the necessary type info.
list->Add(new FxLocalArrayDeclaration(ztype, node->Name, args, *ast));
list->Add(new FxLocalArrayDeclaration(type, node->Name, args, 0, *node));
}
else
{