Merge remote-tracking branch 'remotes/Daniel-Cortez/__pragma'

Author: Y-Less

source/compiler/sc1.c

@@ -5546,6 +5546,11 @@ static void statement(int *lastindent,int allow_decl)
     matchtoken(tSTATIC);
     decl_enum(sLOCAL,FALSE);
     break;
+  case t__PRAGMA:
+    dopragma();
+    needtoken(tTERM);
+    pragma_apply(curfunc);
+    break;
   case t__EMIT: {
     extern char *sc_tokens[];
     const unsigned char *bck_lptr=lptr-strlen(sc_tokens[tok-tFIRST]);
@@ -8284,7 +8289,7 @@ static void pragma_apply(symbol *sym)
       break;
     case attrNAKED:
       if (sym->ident==iFUNCTN)
-        sym->flags=flagNAKED;
+        sym->flags |= flagNAKED;
       break;
     default:
       assert(0);

source/compiler/tests/__pragma.meta

@@ -3,9 +3,10 @@
   'errors': """
 __pragma.pwn(6) : error 001: expected token: "-identifier-", but found "const"
 __pragma.pwn(10) : error 001: expected token: "-identifier-", but found "__pragma"
-__pragma.pwn(31) : warning 234: function is deprecated (symbol "Func") - use OtherFunc() instead
-__pragma.pwn(28) : warning 203: symbol is never used: "f"
-__pragma.pwn(24) : warning 204: symbol is assigned a value that is never used: "e"
-__pragma.pwn(24 -- 37) : warning 203: symbol is never used: "operator~(Tag:)"
+__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(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:)"
 """
 }

source/compiler/tests/__pragma.pwn

@@ -9,10 +9,15 @@ stock Func3(__pragma("unread") const arg) {}
 // "__pragma" can't be used between the tag and the symbol name
 stock Func4(Tag: __pragma("unread") arg) {}
 
-__pragma("naked") NakedFunc(__pragma("naked", "unused") arg) {}
-
 operator~(Tag:val[],count) {}
 
+NakedFunc()
+{
+	__pragma("naked", "deprecated - use NakedFunc2() instead");
+}
+
+__pragma("naked") NakedFunc2(__pragma("naked", "unused") arg = 0) {}
+
 main()
 {
 	new __pragma("unwritten", "unread") a = 0;
@@ -30,7 +35,7 @@ main()
 	// warning 234: function is deprecated (symbol "Func") - use OtherFunc() instead
 	Func(0);
 
-	// NakedFunc() is marked as "naked", so there should be no warning about it
-	// having to return a value
-	return NakedFunc(0);
+	// NakedFunc() and NakedFunc2() are marked as "naked", so there should be
+	// no warnings about them having to return a value.
+	return NakedFunc(), NakedFunc2();
 }