zdoom
/
gzdoom
mirror of https://github.com/ZDoom/gzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disabled default blocks in mixins for now.

This commit is contained in:
Chronos Ouroboros 2020-01-05 19:07:03 -03:00
parent 98ee0a7035
commit a83fff0eb4
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/scripting/zscript/zcc_compile.cpp
View File

@ -268,11 +268,9 @@ void ZCCCompiler::ProcessMixin(ZCC_MixinDef *cnode, PSymbolTreeNode *treenode)
{ {
ZCC_MixinWork *cls = new ZCC_MixinWork(cnode, treenode); ZCC_MixinWork *cls = new ZCC_MixinWork(cnode, treenode);
Mixins.Push(cls);
auto node = cnode->Body; auto node = cnode->Body;
// Need to check if the class actually has a body. // Need to check if the mixin actually has a body.
if (node != nullptr) do if (node != nullptr) do
{ {
if (cnode->MixinType == ZCC_Mixin_Class) if (cnode->MixinType == ZCC_Mixin_Class)
@ -288,10 +286,13 @@ void ZCCCompiler::ProcessMixin(ZCC_MixinDef *cnode, PSymbolTreeNode *treenode)
case AST_EnumTerminator: case AST_EnumTerminator:
case AST_States: case AST_States:
case AST_FuncDeclarator: case AST_FuncDeclarator:
case AST_Default:
case AST_StaticArrayStatement: case AST_StaticArrayStatement:
break; break;
case AST_Default:
Error(node, "Default blocks currently disabled in mixins");
return;
default: default:
assert(0 && "Unhandled AST node type"); assert(0 && "Unhandled AST node type");
break; break;
@ -300,6 +301,8 @@ void ZCCCompiler::ProcessMixin(ZCC_MixinDef *cnode, PSymbolTreeNode *treenode)
node = node->SiblingNext; node = node->SiblingNext;
} while (node != cnode->Body); } while (node != cnode->Body);
Mixins.Push(cls);
} }
//========================================================================== //==========================================================================