zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-11-10 23:02:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Add missing diagnostic information for getactor/setactor

Browse source 
Internally, there are several different permutations of the opcodes that implement CON_GETACTOR and CON_SETACTOR. This maps the internal opcodes back to the external keywords that generated them and makes sure they all have the script line number attached to them for use in diagnostic warning and error messages.

git-svn-id: https://svn.eduke32.com/eduke32@8719 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2020-03-12 00:58:10 +00:00 committed by Christoph Oelckers
parent e88535a228
commit 19630b0d4e
1 changed files with 26 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
source/duke3d/src/gamedef.cpp
View file

@ -840,14 +840,31 @@ const tokenmap_t iter_tokens [] =
{ "walofsec", ITER_WALLSOFSECTOR }, { "walofsec", ITER_WALLSOFSECTOR },
}; };
char const * VM_GetKeywordForID(int32_t id) // some keywords generate different opcodes depending on the context the keyword is used in
// keywords_for_private_opcodes[] resolves those opcodes to the publicly facing keyword that can generate them
static const tokenmap_t keywords_for_private_opcodes[] =
{ {
// could be better but this is only called for diagnostics, ayy lmao { "getactor", CON_GETSPRITEEXT },
{ "getactor", CON_GETACTORSTRUCT },
{ "getactor", CON_GETSPRITESTRUCT },
{ "setactor", CON_SETSPRITEEXT },
{ "setactor", CON_SETACTORSTRUCT },
{ "setactor", CON_SETSPRITESTRUCT },
};
char const *VM_GetKeywordForID(int32_t id)
{
// could be better, but this is used strictly for diagnostic warning and error messages
for (tokenmap_t const & keyword : vm_keywords) for (tokenmap_t const & keyword : vm_keywords)
if (keyword.val == id) if (keyword.val == id)
return keyword.token; return keyword.token;
return "<unknown>"; for (tokenmap_t const & keyword : keywords_for_private_opcodes)
if (keyword.val == id)
return keyword.token;
return "<unknown instruction>";
} }
#endif #endif
@ -3277,11 +3294,11 @@ DO_DEFSTATE:
if (label.offset != -1 && (label.flags & (LABEL_WRITEFUNC|LABEL_HASPARM2)) == 0) if (label.offset != -1 && (label.flags & (LABEL_WRITEFUNC|LABEL_HASPARM2)) == 0)
{ {
if (labelNum >= ACTOR_SPRITEEXT_BEGIN) if (labelNum >= ACTOR_SPRITEEXT_BEGIN)
*ins = CON_SETSPRITEEXT; *ins = CON_SETSPRITEEXT | LINE_NUMBER;
else if (labelNum >= ACTOR_STRUCT_BEGIN) else if (labelNum >= ACTOR_STRUCT_BEGIN)
*ins = CON_SETACTORSTRUCT; *ins = CON_SETACTORSTRUCT | LINE_NUMBER;
else else
*ins = CON_SETSPRITESTRUCT; *ins = CON_SETSPRITESTRUCT | LINE_NUMBER;
} }
scriptWriteValue(label.lId); scriptWriteValue(label.lId);
@ -3308,11 +3325,11 @@ DO_DEFSTATE:
if (label.offset != -1 && (label.flags & (LABEL_READFUNC|LABEL_HASPARM2)) == 0) if (label.offset != -1 && (label.flags & (LABEL_READFUNC|LABEL_HASPARM2)) == 0)
{ {
if (labelNum >= ACTOR_SPRITEEXT_BEGIN) if (labelNum >= ACTOR_SPRITEEXT_BEGIN)
*ins = CON_GETSPRITEEXT; *ins = CON_GETSPRITEEXT | LINE_NUMBER;
else if (labelNum >= ACTOR_STRUCT_BEGIN) else if (labelNum >= ACTOR_STRUCT_BEGIN)
*ins = CON_GETACTORSTRUCT; *ins = CON_GETACTORSTRUCT | LINE_NUMBER;
else else
*ins = CON_GETSPRITESTRUCT; *ins = CON_GETSPRITESTRUCT | LINE_NUMBER;
} }
scriptWriteValue(label.lId); scriptWriteValue(label.lId);