Removed deprecated warning IDs for good

Author: RPGHacker

src/asar/assembleblock.cpp

@@ -1122,7 +1122,7 @@ void assembleblock(const char * block)
 			}
 			else
 			{
-				asar_throw_error(0, error_type_block, error_id_invalid_warning_id, "warnings enable", (int)(warning_id_start + 1), (int)(warning_id_end - 1));
+				asar_throw_error(0, error_type_block, error_id_invalid_warning_id, word[2], "warnings enable");
 			}
 		}
 		else if (stricmp(word[1], "disable") == 0)
@@ -1135,7 +1135,7 @@ void assembleblock(const char * block)
 			}
 			else
 			{
-				asar_throw_error(0, error_type_block, error_id_invalid_warning_id, "warnings disable", (int)(warning_id_start + 1), (int)(warning_id_end - 1));
+				asar_throw_error(0, error_type_block, error_id_invalid_warning_id, word[2], "warnings disable");
 			}
 		}
 		else

src/asar/errors.cpp

@@ -229,7 +229,7 @@ static asar_error_mapping asar_errors[] =
 	{ ERR(invalid_print_function_syntax), "Invalid printable string syntax." },
 	{ ERR(unknown_variable), "Unknown variable." },
 
-	{ ERR(invalid_warning_id), "Invalid warning ID passed to %s. Expected format is WXXXX where %d <= XXXX <= %d." },
+	{ ERR(invalid_warning_id), "Warning '%s' (passed to %s) doesn't exist." },
 
 	{ ERR(pushwarnings_without_pullwarnings), "warnings push without matching warnings pull." },
 	{ ERR(pullwarnings_without_pushwarnings), "warnings pull without matching warnings push." },

src/asar/interface-cli.cpp

@@ -380,15 +380,16 @@ int main(int argc, const char * argv[])
 				}
 				else if (checkstartmatch(w_param, "no"))
 				{
-					asar_warning_id warnid = parse_warning_id_from_string(w_param + strlen("no"));
+					const char* name_start = w_param + strlen("no");
+					asar_warning_id warnid = parse_warning_id_from_string(name_start);
 
 					if (warnid != warning_id_end)
 					{
 						set_warning_enabled(warnid, false);
 					}
 					else
 					{
-						asar_throw_error(pass, error_type_null, error_id_invalid_warning_id, "-wno", (int)(warning_id_start + 1), (int)(warning_id_end - 1));
+						asar_throw_error(pass, error_type_null, error_id_invalid_warning_id, name_start, "-wno");
 					}
 				}
 				else
@@ -401,7 +402,7 @@ int main(int argc, const char * argv[])
 					}
 					else
 					{
-						asar_throw_error(pass, error_type_null, error_id_invalid_warning_id, "-w", (int)(warning_id_start + 1), (int)(warning_id_end - 1));
+						asar_throw_error(pass, error_type_null, error_id_invalid_warning_id, w_param, "-w");
 					}
 				}
 

src/asar/interface-lib.cpp

@@ -372,7 +372,7 @@ EXPORT bool asar_patch(const patchparams_base *params)
 			}
 			else
 			{
-				asar_throw_error(pass, error_type_null, error_id_invalid_warning_id, "asar_patch_ex() warning_settings", (int)(warning_id_start + 1), (int)(warning_id_end - 1));
+				asar_throw_error(pass, error_type_null, error_id_invalid_warning_id, paramscurrent.warning_settings[i].warnid, "asar_patch_ex() warning_settings");
 			}
 		}
 

src/asar/warnings.cpp

@@ -171,23 +171,8 @@ asar_warning_id parse_warning_id_from_string(const char* string)
 			return asar_warnings[i].warnid;
 		}
 	}
-	char* endpos = nullptr;
-	int numid = (int)strtol(pos, &endpos, 10);
 
-	if (endpos == nullptr || endpos[0] != '\0')
-	{
-		return warning_id_end;
-	}
-
-	asar_warning_id warnid = (asar_warning_id)numid;
-
-	if (warnid <= warning_id_start || warnid >= warning_id_end)
-	{
-		return warning_id_end;
-	}
-
-	asar_throw_warning(1, warning_id_feature_deprecated, "Numerical warnings", "Please transition to Wwarning_name");
-	return warnid;
+	return warning_id_end;
 }
 
 void reset_warnings_to_default()

tests/warnings-1.asm

@@ -1,10 +1,9 @@
 ;`+
 ;`01
-;`warnWfeature_deprecated
 
+org $008000
 warnings push
 warnings disable Wmissing_org
-warnings disable W1008
 
 db $01
 

tests/warnings-deprecated.asm

@@ -0,0 +1,9 @@
+;`errEinvalid_warning_id
+
+org $008000
+warnings push
+warnings disable Einvalid_warning_id
+
+db $01
+
+warnings pull