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

Nuke spurious NULL checks in spcomp to appease Clang 3.5

Browse Source
This commit is contained in:
Nicholas Hastings 2014-09-09 22:04:24 -04:00
parent acdd9e12ea
commit 9a9446400d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sourcepawn/compiler/sc1.cpp
View File

@ -6943,7 +6943,7 @@ static int test(int label,int parens,int invert)
if (endtok!=0)
needtoken(endtok);
if (ident==iARRAY || ident==iREFARRAY) {
const char *ptr=(sym->name!=NULL) ? sym->name : "-unknown-";
const char *ptr=sym->name;
error(33,ptr); /* array must be indexed */
} /* if */
if (ident==iCONSTEXPR) { /* constant expression */

6
sourcepawn/compiler/sc3.cpp
View File

@ -643,7 +643,7 @@ static int skim(int *opstr,void (*testfunc)(int),int dropval,int endval,
foundop=nextop(&opidx,opstr);
if ((foundop || hits) && (lval->ident==iARRAY || lval->ident==iREFARRAY))
error(33, lval->sym ? (lval->sym->name ? lval->sym->name : "-unknown") : "-unknown-"); /* array was not indexed in an expression */
error(33, lval->sym ? lval->sym->name : "-unknown-"); /* array was not indexed in an expression */
if (foundop) {
if (!hits) {
/* this is the first operator in the list */
@ -1419,12 +1419,12 @@ static int hier13(value *lval)
array2= (lval2.ident==iARRAY || lval2.ident==iREFARRAY);
if (!array1 && array2) {
const char *ptr = "-unknown-";
if (lval->sym != NULL && lval->sym->name != NULL)
if (lval->sym != NULL)
ptr = lval->sym->name;
error(33,ptr); /* array must be indexed */
} else if (array1 && !array2) {
const char *ptr = "-unknown-";
if (lval2.sym != NULL && lval2.sym->name != NULL)
if (lval2.sym != NULL)
ptr = lval2.sym->name;
error(33,ptr); /* array must be indexed */
} /* if */