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

- Added modulus to FParseContext/xlat. 

- Fixed: Division of tag arguments for xlat was in the wrong order.

SVN r3344 (trunk)
This commit is contained in:
Randy Heit 2012-01-23 02:47:51 +00:00
parent b21062c39a
commit 4b2ae689ed
5 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/p_xlat.cpp
View File

@ -137,13 +137,14 @@ void P_TranslateLineDef (line_t *ld, maplinedef_t *mld)
int tagop = (linetrans->flags >> (LINETRANS_TAGSHIFT + t*TAGOP_NUMBITS)) & TAGOP_MASK;
switch (tagop)
{
case TAGOP_None: default: break;
case TAGOP_Add: ld->args[t] += tag; break;
case TAGOP_Mul: ld->args[t] *= tag; break;
case TAGOP_Div: ld->args[t] /= tag; break;
case TAGOP_And: ld->args[t] &= tag; break;
case TAGOP_Or: ld->args[t] |= tag; break;
case TAGOP_Xor: ld->args[t] ^= tag; break;
case TAGOP_None: default: break;
case TAGOP_Add: ld->args[t] += tag; break;
case TAGOP_Mul: ld->args[t] *= tag; break;
case TAGOP_Div: ld->args[t] = tag / ld->args[t]; break;
case TAGOP_Mod: ld->args[t] = tag % ld->args[t]; break;
case TAGOP_And: ld->args[t] &= tag; break;
case TAGOP_Or: ld->args[t] |= tag; break;
case TAGOP_Xor: ld->args[t] ^= tag; break;
}
}

1
src/parsecontext.cpp
View File

@ -267,6 +267,7 @@ loop:
case '-': return TokenTrans[MINUS];
case '+': return TokenTrans[PLUS];
case '*': return TokenTrans[MULTIPLY];
case '%': return TokenTrans[MODULUS];
case '(': return TokenTrans[LPAREN];
case ')': return TokenTrans[RPAREN];
case ',': return TokenTrans[COMMA];

2
src/parsecontext.h
View File

@ -47,6 +47,7 @@ enum
PLUS ,
MULTIPLY ,
DIVIDE ,
MODULUS ,
NUM ,
FLOATVAL ,
LPAREN ,
@ -78,6 +79,7 @@ enum
prefix##PLUS, \
prefix##MULTIPLY, \
prefix##DIVIDE, \
prefix##MODULUS, \
prefix##NUM, \
prefix##FLOATVAL, \
prefix##LPAREN, \

1
src/xlat/xlat.h
View File

@ -10,6 +10,7 @@ enum ELineTransTagOp
TAGOP_Add,
TAGOP_Mul,
TAGOP_Div,
TAGOP_Mod,
TAGOP_And,
TAGOP_Or,
TAGOP_Xor,

10
src/xlat/xlat_parser.y
View File

@ -36,6 +36,7 @@ exp(A) ::= exp(B) PLUS exp(C). { A = B + C; }
exp(A) ::= exp(B) MINUS exp(C). { A = B - C; }
exp(A) ::= exp(B) MULTIPLY exp(C). { A = B * C; }
exp(A) ::= exp(B) DIVIDE exp(C). { if (C != 0) A = B / C; else context->PrintError("Division by zero"); }
exp(A) ::= exp(B) MODULUS exp(C). { if (C != 0) A = B % C; else context->PrintError("Division by zero"); }
exp(A) ::= exp(B) OR exp(C). { A = B | C; }
exp(A) ::= exp(B) AND exp(C). { A = B & C; }
exp(A) ::= exp(B) XOR exp(C). { A = B ^ C; }
@ -135,6 +136,15 @@ special_arg(Z) ::= TAG DIVIDE exp(A).
context->PrintError("Division by zero");
}
}
special_arg(Z) ::= TAG MODULUS exp(A).
{
Z.arg = A;
Z.tagop = TAGOP_Mod;
if (A == 0)
{
context->PrintError("Division by zero");
}
}
special_arg(Z) ::= TAG OR exp(A).
{
Z.arg = A;