zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Disallow const qualifier for classes

Browse source
This commit is contained in:
ZZYZX 2017-02-17 20:04:40 +02:00
parent 195ae24dcb
commit 496b2a74ce
1 changed files with 13 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2128,6 +2128,13 @@ void ZCCCompiler::CompileFunction(ZCC_StructWork *c, ZCC_FuncDeclarator *f, bool
if (f->Flags & ZCC_ClearScope) if (f->Flags & ZCC_ClearScope)
varflags = (varflags&~(VARF_Play | VARF_UI)); varflags = (varflags&~(VARF_Play | VARF_UI));
// [ZZ] supporting const self for actors is quite a cumbersome task because there's no concept of a const pointer (?)
// either way, it doesn't make sense, because you can call any method on a readonly class instance.
if ((f->Flags & ZCC_FuncConst) && !(c->Type()->IsKindOf(RUNTIME_CLASS(PStruct))))
{
Error(f, "'Const' on a method can only be used in structs");
}
if ((f->Flags & ZCC_VarArg) && !(f->Flags & ZCC_Native)) if ((f->Flags & ZCC_VarArg) && !(f->Flags & ZCC_Native))
{ {
Error(f, "'VarArg' can only be used with native methods"); Error(f, "'VarArg' can only be used with native methods");
@ -2173,6 +2180,12 @@ void ZCCCompiler::CompileFunction(ZCC_StructWork *c, ZCC_FuncDeclarator *f, bool
} }
if (varflags & VARF_Override) varflags |= VARF_Virtual; // Now that the flags are checked, make all override functions virtual as well. if (varflags & VARF_Override) varflags |= VARF_Virtual; // Now that the flags are checked, make all override functions virtual as well.
// [ZZ] this doesn't make sense either.
if ((varflags&(VARF_ReadOnly | VARF_Method)) == VARF_ReadOnly) // non-method const function
{
Error(f, "'Const' on a static method is not supported");
}
// you can't have a const function belonging to either ui or play. // you can't have a const function belonging to either ui or play.
// const is intended for plain data to signify that you can call a method on readonly variable. // const is intended for plain data to signify that you can call a method on readonly variable.
if ((f->Flags & ZCC_FuncConst) && (f->Flags & (ZCC_UIFlag | ZCC_Play))) if ((f->Flags & ZCC_FuncConst) && (f->Flags & (ZCC_UIFlag | ZCC_Play)))