Merge remote-tracking branch 'remotes/DanielCortez/w244' into dev

Author: Y-Less

source/compiler/sc1.c

@@ -6071,7 +6071,7 @@ static void doswitch(void)
   int swdefault,casecount;
   int tok,endtok;
   int swtag,csetag;
-  int enumsymcount,diff;
+  int enumsymcount;
   int save_fline;
   symbol *enumsym,*csesym;
   int ident;
@@ -6219,7 +6219,7 @@ static void doswitch(void)
   } while (tok!=endtok);
   restoreassignments(pc_nestlevel+1,assignments);
 
-  if (enumsym!=NULL && swdefault==FALSE && (diff=enumsym->x.tags.unique-enumsymcount)<=2) {
+  if (enumsym!=NULL && swdefault==FALSE && enumsym->x.tags.unique-enumsymcount<=2) {
     constvalue_root *enumlist=enumsym->dim.enumlist;
     constvalue *val,*prev=NULL,*save_next=NULL;
     for (val=enumlist->first; val!=NULL; prev=val,val=val->next) {
@@ -6237,8 +6237,9 @@ static void doswitch(void)
       /* check if the value of this constant is handled in switch, if so - continue */
       if (find_constval_byval(&caselist,val->value)!=NULL)
         continue;
+      errorset(sSETPOS,save_fline);
       error(244,val->name); /* enum element not handled in switch */
-      /*  */
+      errorset(sSETPOS,-1);
     } /* while */
   } /* if */
 

source/compiler/tests/warning_244.meta

@@ -1,7 +1,7 @@
 {
   'test_type': 'output_check',
   'errors': """
-warning_244.pwn(37) : warning 244: enum element "CONST2_3" not handled in switch
-warning_244.pwn(37) : warning 244: enum element "CONST2_5" not handled in switch
+warning_244.pwn(30) : warning 244: enum element "CONST2_3" not handled in switch
+warning_244.pwn(30) : warning 244: enum element "CONST2_5" not handled in switch
 """
 }