Merge remote-tracking branch 'remotes/DanielCortez/__pragma-warning' into dev

Author: Y-Less

source/compiler/sc.h

@@ -539,6 +539,12 @@ typedef enum s_optmark {
 
 #define MAX_INSTR_LEN   30
 
+typedef enum s_warnmode {
+  warnDISABLE,
+  warnENABLE,
+  warnTOGGLE
+} warnmode;
+
 #define eotNUMBER       0
 #define eotFUNCTION     1
 #define eotLABEL        2
@@ -607,7 +613,7 @@ enum { /* attribute flags for "__pragma" */
 int pc_compile(int argc, char **argv);
 int pc_addconstant(char *name,cell value,int tag);
 int pc_addtag(char *name);
-int pc_enablewarning(int number,int enable);
+int pc_enablewarning(int number,warnmode enable);
 int pc_pushwarnings();
 int pc_popwarnings();
 void pc_seterrorwarnings(int enable);
@@ -698,6 +704,7 @@ SC_FUNC stkitem popstk(void);
 SC_FUNC void clearstk(void);
 SC_FUNC int plungequalifiedfile(char *name);  /* explicit path included */
 SC_FUNC int plungefile(char *name,int try_currentpath,int try_includepaths);   /* search through "include" paths */
+SC_FUNC int number(cell *val,const unsigned char *curptr);
 SC_FUNC void preprocess(void);
 SC_FUNC void lexinit(void);
 SC_FUNC int lex(cell *lexvalue,char **lexsym);

source/compiler/sc1.c

@@ -1213,11 +1213,11 @@ static void parseoptions(int argc,char **argv,char *oname,char *ename,char *pnam
       case 'w':
         i=(int)strtol(option_value(ptr),(char **)&ptr,10);
         if (*ptr=='-')
-          pc_enablewarning(i,0);
+          pc_enablewarning(i,warnDISABLE);
         else if (*ptr=='+')
-          pc_enablewarning(i,1);
+          pc_enablewarning(i,warnENABLE);
         else if (*ptr=='\0')
-          pc_enablewarning(i,2);
+          pc_enablewarning(i,warnTOGGLE);
         break;
       case 'X':
         if (*(ptr+1)=='D') {
@@ -8165,7 +8165,6 @@ static void dopragma(void)
   int tok;
   int bck_litidx,bck_packstr;
   int i;
-  int hasparams;
   cell val;
   char *str;
 
@@ -8200,7 +8199,7 @@ static void dopragma(void)
     assert(litidx>bck_litidx);
 
     /* the user shouldn't prepend "!" to the option string */
-    if (litq[val]<=UNPACKEDMAX) {
+    if (litq[val]<=UNPACKEDMAX && litq[val]!=0) {
       error(1,sc_tokens[tSTRING-tFIRST],"!");
       goto next;
     } /* if */
@@ -8230,11 +8229,13 @@ static void dopragma(void)
 
     /* split the option name from parameters */
     str=(char*)&litq[val];
-    for (i=0; str[i]!='\0' && str[i]!=' '; i++) {}
-    hasparams=(str[i]!='\0');
-    str[i]='\0';
-    if (hasparams)
-      while (str[++i]==' ') {}
+    for (i=0; str[i]!='\0' && str[i]!=' '; i++)
+      /* nothing */;
+    if (str[i]!='\0') {
+      str[i]='\0';
+      while (str[++i]==' ')
+        /* nothing */;
+    } /* if */
 
     /* check the option name, set the corresponding attribute flag
      * and parse the argument(s), if needed */
@@ -8246,15 +8247,48 @@ static void dopragma(void)
       pc_attributes |= (1U << attrDEPRECATED);
     } else if (!strcmp(str,"unused")) {
       pc_attributes |= (1U << attrUNUSED);
+      if (str[i]!='\0') goto unknown_pragma;
     } else if (!strcmp(str,"unread")) {
       pc_attributes |= (1U << attrUNREAD);
+      if (str[i]!='\0') goto unknown_pragma;
     } else if (!strcmp(str,"unwritten")) {
       pc_attributes |= (1U << attrUNWRITTEN);
+      if (str[i]!='\0') goto unknown_pragma;
     } else if (!strcmp(str,"nodestruct")) {
       pc_attributes |= (1U << attrNODESTRUCT);
+      if (str[i]!='\0') goto unknown_pragma;
     } else if (!strcmp(str,"naked")) {
       pc_attributes |= (1U << attrNAKED);
+      if (str[i]!='\0') goto unknown_pragma;
+    } else if (!strcmp(str,"warning")) {
+      str += i;
+      while (*str==' ') str++;
+      for (i=0; str[i]!='\0' && str[i]!=' '; i++)
+        /* nothing */;
+      if (str[i]!='\0') {
+        str[i]='\0';
+        while (str[++i]==' ')
+          /* nothing */;
+      } /* if */
+      if (strcmp(str,"enable")==0 || strcmp(str,"disable")==0) {
+        int len=number(&val,&str[i]);
+        if (len==0)
+          goto unknown_pragma;
+        pc_enablewarning((int)val,(str[0]=='e') ? warnENABLE : warnDISABLE);
+        /* warn if there are extra characters after the warning number */
+        for (i += len; str[i]==' '; i++)
+          /* nothing */;
+        if (str[i]!='\0')
+          goto unknown_pragma;
+      } else if (strcmp(str,"push")==0 && str[i]=='\0') {
+        pc_pushwarnings();
+      } else if (strcmp(str,"pop")==0 && str[i]=='\0') {
+        pc_popwarnings();
+      } else {
+        goto unknown_pragma;
+      } /* if */
     } else {
+unknown_pragma:
       error(207);       /* unknown #pragma */
     } /* if */
 

source/compiler/sc2.c

@@ -843,7 +843,7 @@ static int ftoi(cell *val,const unsigned char *curptr)
  *        for at "hier2()" (in fact, it is viewed as an operator, not as a
  *        sign) and the + is invalid (as in K&R C, and unlike ANSI C).
  */
-static int number(cell *val,const unsigned char *curptr)
+SC_FUNC int number(cell *val,const unsigned char *curptr)
 {
   int i;
   cell value;
@@ -1305,29 +1305,23 @@ static int command(void)
         } else if (strcmp(str,"warning")==0) {
           int ok=lex(&val,&str)==tSYMBOL;
           if (ok) {
-            if (strcmp(str,"enable")==0) {
+            if (strcmp(str,"enable")==0 || strcmp(str,"disable")==0) {
               cell val;
               do {
                 preproc_expr(&val,NULL);
-                pc_enablewarning(val,1);
-              } while (*lptr!='\0');
-            } else if (strcmp(str,"disable")==0) {
-              cell val;
-              do {
-                preproc_expr(&val,NULL);
-                pc_enablewarning(val,0);
+                pc_enablewarning(val,(str[0]=='e') ? warnENABLE : warnDISABLE);
               } while (*lptr!='\0');
             } else if (strcmp(str,"push")==0) {
               pc_pushwarnings();
             } else if (strcmp(str,"pop")==0) {
               pc_popwarnings();
             } else {
               ok=FALSE;
-            }
+            } /* if */
           }
           if (!ok) {
             error(207);         /* unknown #pragma */
-          }
+          } /* if */
         } else if (strcmp(str,"compat")==0) {
           cell val;
           symbol *sym;

source/compiler/sc5.c

@@ -385,7 +385,7 @@ SC_FUNC void errorset(int code,int line)
  *  o  1 for enable
  *  o  2 for toggle
  */
-int pc_enablewarning(int number,int enable)
+int pc_enablewarning(int number,warnmode enable)
 {
   int index;
   unsigned char mask;
@@ -399,13 +399,13 @@ int pc_enablewarning(int number,int enable)
   index=number/8;
   mask=(unsigned char)(1 << (number%8));
   switch (enable) {
-  case 0:
+  case warnDISABLE:
     warnstack.disable[index] |= mask;
     break;
-  case 1:
+  case warnENABLE:
     warnstack.disable[index] &= (unsigned char)~mask;
     break;
-  case 2:
+  case warnTOGGLE:
     warnstack.disable[index] ^= mask;
     break;
   } /* switch */

source/compiler/tests/__pragma.meta

@@ -5,8 +5,15 @@ __pragma.pwn(6) : error 001: expected token: "-identifier-", but found "const"
 __pragma.pwn(10) : error 001: expected token: "-identifier-", but found "__pragma"
 __pragma.pwn(36) : warning 234: function is deprecated (symbol "Func") - use OtherFunc() instead
 __pragma.pwn(40) : warning 234: function is deprecated (symbol "NakedFunc") - use NakedFunc2() instead
+__pragma.pwn(43) : warning 207: unknown #pragma
+__pragma.pwn(44) : warning 207: unknown #pragma
+__pragma.pwn(48) : warning 207: unknown #pragma
+__pragma.pwn(62) : warning 200: symbol "long_name2_zzzzzzzz_zzzzzzzzz_z" is truncated to 31 characters
+__pragma.pwn(66) : warning 207: unknown #pragma
+__pragma.pwn(67) : warning 207: unknown #pragma
+__pragma.pwn(68) : warning 207: unknown #pragma
 __pragma.pwn(33) : warning 203: symbol is never used: "f"
 __pragma.pwn(29) : warning 204: symbol is assigned a value that is never used: "e"
-__pragma.pwn(29 -- 42) : warning 203: symbol is never used: "operator~(Tag:)"
+__pragma.pwn(29 -- 70) : warning 203: symbol is never used: "operator~(Tag:)"
 """
 }

source/compiler/tests/__pragma.pwn

@@ -37,5 +37,33 @@ main()
 
 	// NakedFunc() and NakedFunc2() are marked as "naked", so there should be
 	// no warnings about them having to return a value.
-	return NakedFunc(), NakedFunc2();
+	new __pragma("unused") retval = (NakedFunc(), NakedFunc2());
+
+	// Make sure the compiler doesn't crash on an empty `__pragma`.
+	__pragma(""); // warning 207: unknown #pragma
+	__pragma(" "); // warning 207: unknown #pragma
+
+	// `#pragma` warns about extra characters after the option name,
+	// so `__pragma` should do the same.
+	__pragma("unused b"); // warning 207: unknown #pragma
+	// But it shouldn't warn if there are only trailing whitespaces after the name.
+	__pragma("naked   ");
+
+	// Warning 200 is going to be temporarily disabled, so the compiler
+	// shouldn't warn about the first variable having too long name.
+	// Also the parameter strings contain excess whitespaces, the compiler
+	// should ignore them.
+	__pragma("warning push ", "warning disable 200  ");
+	new
+		long_name_zzzzzzzzz_zzzzzzzzz_zzzzzzzzz_ __pragma("unused"),
+		// `__pragma("warning")` takes effect immediately, so the compiler
+		// should warn that the name of the next variable is too long.
+		// warning 200: symbol "long_name2_zzzzzzzz_zzzzzzzzz_z" is truncated to 31 characters
+		__pragma("warning enable 200   ", "unused") long_name2_zzzzzzzz_zzzzzzzzz_zzzzzzzzz_ __pragma("unused");
+	__pragma("warning pop    ");
+
+	// Warn if the parameter of "warning disable" is not a number.
+	__pragma("warning enable    "); // warning 207: unknown #pragma
+	__pragma("warning enable  a "); // warning 207: unknown #pragma
+	__pragma("warning enable  - "); // warning 207: unknown #pragma
 }