UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix comparisons of derived tags (bug 6239).

Browse Source
This commit is contained in:
David Anderson 2014-11-08 20:27:39 -08:00
parent 7609d19e32
commit 704e9579f7
3 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sourcepawn/compiler/sc.h
View File

@ -647,6 +647,7 @@ char *itoh(ucell val);
#define MATCHTAG_COERCE 0x1 // allow coercion #define MATCHTAG_COERCE 0x1 // allow coercion
#define MATCHTAG_SILENT 0x2 // silence the error(213) warning #define MATCHTAG_SILENT 0x2 // silence the error(213) warning
#define MATCHTAG_COMMUTATIVE 0x4 // order does not matter #define MATCHTAG_COMMUTATIVE 0x4 // order does not matter
#define MATCHTAG_DEDUCE 0x8 // correct coercion
/* function prototypes in SC3.C */ /* function prototypes in SC3.C */
int check_userop(void (*oper)(void),int tag1,int tag2,int numparam, int check_userop(void (*oper)(void),int tag1,int tag2,int numparam,

4
sourcepawn/compiler/sc3.cpp
View File

@ -550,7 +550,7 @@ int matchtag(int formaltag, int actualtag, int flags)
return TRUE; return TRUE;
} }
if (flags & MATCHTAG_COERCE) { if (flags & (MATCHTAG_COERCE|MATCHTAG_DEDUCE)) {
// See if the tag has a methodmap associated with it. If so, see if the given // See if the tag has a methodmap associated with it. If so, see if the given
// tag is anywhere on the inheritance chain. // tag is anywhere on the inheritance chain.
methodmap_t *map = methodmap_find_by_tag(actualtag); methodmap_t *map = methodmap_find_by_tag(actualtag);
@ -888,7 +888,7 @@ static void plnge2(void (*oper)(void),
} else { } else {
// For the purposes of tag matching, we consider the order to be irrelevant. // For the purposes of tag matching, we consider the order to be irrelevant.
if (!checktag_string(lval1, lval2)) if (!checktag_string(lval1, lval2))
matchtag(lval1->tag, lval2->tag, MATCHTAG_COMMUTATIVE); matchtag(lval1->tag, lval2->tag, MATCHTAG_COMMUTATIVE|MATCHTAG_DEDUCE);
(*oper)(); /* do the (signed) operation */ (*oper)(); /* do the (signed) operation */
lval1->ident=iEXPRESSION; lval1->ident=iEXPRESSION;
} /* if */ } /* if */

18
sourcepawn/compiler/tests/ok-coerce-on-operators.sp Normal file
View File

@ -0,0 +1,18 @@
enum Handle {
INVALID_HANDLE,
};
methodmap Handle {};
methodmap ArrayList < Handle {};
public void MyCommand()
{
ArrayList myList;
if (INVALID_HANDLE == myList)
{
}
if (myList == INVALID_HANDLE)
{
}
}