Skip to content

Commit 7ea9934

Browse files
committed
Merge remote-tracking branch 'remotes/DanielCortez/w240' into dev
2 parents fbf9071 + ffac185 commit 7ea9934

File tree

3 files changed

+2
-4
lines changed

3 files changed

+2
-4
lines changed

source/compiler/sc2.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -3202,7 +3202,7 @@ SC_FUNC void markinitialized(symbol *sym,int assignment)
32023202
return;
32033203
if (sc_status==statFIRST && (sym->vclass==sLOCAL || sym->vclass==sSTATIC))
32043204
return;
3205-
if (assignment && sym->vclass!=sGLOBAL && (sym->ident==iVARIABLE || sym->ident==iREFERENCE)) {
3205+
if (assignment && sym->vclass==sLOCAL && (sym->ident==iVARIABLE || sym->ident==iREFERENCE)) {
32063206
sym->usage |= uASSIGNED;
32073207
sym->assignlevel=pc_nestlevel;
32083208
} /* if */

source/compiler/sc3.c

+1-2
Original file line numberDiff line numberDiff line change
@@ -1083,8 +1083,7 @@ static int hier14(value *lval1)
10831083
if (oper==NULL) {
10841084
symbol *sym=lval3.sym;
10851085
assert(sym!=NULL);
1086-
if ((sym->usage & uASSIGNED)!=0 && sym->assignlevel>=pc_nestlevel
1087-
&& (sym->vclass==sLOCAL || sym->vclass==sSTATIC))
1086+
if ((sym->usage & uASSIGNED)!=0 && sym->assignlevel>=pc_nestlevel && sym->vclass==sLOCAL)
10881087
error(240,sym->name); /* previously assigned value is unused */
10891088
markinitialized(sym,TRUE);
10901089
if (pc_ovlassignment)

source/compiler/tests/warning_240.meta

-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ warning_240.pwn(97) : warning 240: previously assigned value is never used (symb
1212
warning_240.pwn(109) : warning 240: previously assigned value is never used (symbol "local_var")
1313
warning_240.pwn(120) : warning 240: previously assigned value is never used (symbol "local_var")
1414
warning_240.pwn(139) : warning 240: previously assigned value is never used (symbol "local_var")
15-
warning_240.pwn(148) : warning 240: previously assigned value is never used (symbol "local_static_var")
1615
warning_240.pwn(174) : warning 240: previously assigned value is never used (symbol "arg")
1716
warning_240.pwn(178) : warning 240: previously assigned value is never used (symbol "arg")
1817
warning_240.pwn(183) : warning 240: previously assigned value is never used (symbol "refarg")

0 commit comments

Comments
 (0)