mirror of
https://github.com/alliedmodders/amxmodx.git
synced 2024-12-25 14:25:38 +03:00
Merge pull request #164 from Arkshine/fix/regression-member-tag-of-enum
FIx regression with member tag of enum not being checked on assigment
This commit is contained in:
commit
1df58d6231
@ -240,6 +240,7 @@ typedef struct s_value {
|
|||||||
cell constval; /* value of the constant expression (if ident==iCONSTEXPR)
|
cell constval; /* value of the constant expression (if ident==iCONSTEXPR)
|
||||||
* also used for the size of a literal array */
|
* also used for the size of a literal array */
|
||||||
int tag; /* tagname id (of the expression) */
|
int tag; /* tagname id (of the expression) */
|
||||||
|
char forceuntag; /* whether expression is untagged using _: */
|
||||||
char ident; /* iCONSTEXPR, iVARIABLE, iARRAY, iARRAYCELL,
|
char ident; /* iCONSTEXPR, iVARIABLE, iARRAY, iARRAYCELL,
|
||||||
* iEXPRESSION or iREFERENCE */
|
* iEXPRESSION or iREFERENCE */
|
||||||
char boolresult; /* boolean result for relational operators */
|
char boolresult; /* boolean result for relational operators */
|
||||||
|
@ -973,11 +973,31 @@ static int hier14(value *lval1)
|
|||||||
store(&lval3); /* now, store the expression result */
|
store(&lval3); /* now, store the expression result */
|
||||||
} /* if */
|
} /* if */
|
||||||
if (!oper) { /* tagname mismatch (if "oper", warning already given in plunge2()) */
|
if (!oper) { /* tagname mismatch (if "oper", warning already given in plunge2()) */
|
||||||
if (lval3.sym && !matchtag(lval3.sym->tag, lval2.tag, TRUE))
|
|
||||||
|
/* If the left value is a tagged symbol, assume that it is not an "enum struct." For
|
||||||
|
example, for "enum X { A, B }; new Float:array[X]" we assume that `A` and `B`
|
||||||
|
are not tagged and the array is an array of floats.
|
||||||
|
*/
|
||||||
|
if (lval3.sym && lval3.sym->tag != 0) {
|
||||||
|
if (!matchtag(lval3.sym->tag, lval2.tag, TRUE))
|
||||||
error(213);
|
error(213);
|
||||||
else if (!lval3.sym && !matchtag(lval3.tag, lval2.tag, TRUE))
|
}
|
||||||
|
else if (lval3.tag && !lval2.tag && lval2.forceuntag) {
|
||||||
|
/* Because of the above fix included in AMXX 1.60, a regression has been introduced
|
||||||
|
as well, where any tagged members of an enum is ignored when a tag check is required.
|
||||||
|
E.g.: enum X {Float:A, SomeTag:B }; new array[X];
|
||||||
|
array[A] = 1.0;
|
||||||
|
With the original fix, tag of array is checked instead of tag of A. Result: tag mismatch.
|
||||||
|
To bypass the issue, plugin has to untag the value like _:1.0.
|
||||||
|
To fix this and to avoid old plugins suddenly getting spammed by warnings, we track
|
||||||
|
when a value is untagged, and if the related enum member is tagged and the value is forced
|
||||||
|
to be untagged, we assume this matches.
|
||||||
|
*/
|
||||||
|
}
|
||||||
|
else if (!matchtag(lval3.tag, lval2.tag, TRUE)) {
|
||||||
error(213);
|
error(213);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (lval3.sym)
|
if (lval3.sym)
|
||||||
markusage(lval3.sym,uWRITTEN);
|
markusage(lval3.sym,uWRITTEN);
|
||||||
sideeffect=TRUE;
|
sideeffect=TRUE;
|
||||||
@ -1203,6 +1223,7 @@ static int hier2(value *lval)
|
|||||||
tag=pc_addtag(st);
|
tag=pc_addtag(st);
|
||||||
lvalue=hier2(lval);
|
lvalue=hier2(lval);
|
||||||
lval->tag=tag;
|
lval->tag=tag;
|
||||||
|
lval->forceuntag=!tag; /* forced to be untagged with _: */
|
||||||
return lvalue;
|
return lvalue;
|
||||||
case tDEFINED:
|
case tDEFINED:
|
||||||
paranthese=0;
|
paranthese=0;
|
||||||
|
Loading…
Reference in New Issue
Block a user