refactor warnings/errors again (this is the last time i promise)

this version allows using "goto references" on the error/warning
definitions. means i had to complicate the error/warn throwing code a
little though

Author: trillllian

docs/parse_warnings.py

@@ -2,8 +2,8 @@
 import re
 import string
 
-warning_pattern = re.compile(r'WRN\((.*?),\s*"(.*)"\s*,\s*(true|false)\)')
-error_pattern = re.compile(r'ERR\((.*?),\s*"(.*)"\)')
+warning_pattern = re.compile(r'WRN\(warn_(.*?),\s*"(.*)"\s*,\s*(true|false)\)')
+error_pattern = re.compile(r'ERR\(err_(.*?),\s*"(.*)"\)')
 escaping = str.maketrans({x: '\\'+x for x in string.punctuation})
 
 def escape(s):

src/asar/errors.cpp

@@ -4,11 +4,15 @@
 #include "std-includes.h"
 #include "errors.h"
 #include "interface-shared.h"
+#include "libstr.h"
 
 void error_impl(const char* error_id, const char* fmt_string, int whichpass, ...) {
 	va_list args; va_start(args, whichpass);
 	char error_buffer[1024];
 	vsnprintf(error_buffer, sizeof(error_buffer), fmt_string, args);
 
-	error_interface(error_id, whichpass, error_buffer);
+	// convert err_xxx -> Exxx
+	string errname = STR "E" + (error_id + 4);
+
+	error_interface(errname.data(), whichpass, error_buffer);
 }

src/asar/errors.h

@@ -125,8 +125,8 @@ void error_interface(const char* errid, int whichpass, const char * e_)
 		errnum++;
 		const char* current_block = get_current_block();
 		// don't show current block if the error came from an error command or limit reached
-		bool show_block = (current_block && (strcmp(errid, "error_command") != 0 && strcmp(errid, "limit_reached") != 0));
-		bool show_stack = strcmp(errid, "limit_reached") != 0;
+		bool show_block = (current_block && (strcmp(errid, "Eerror_command") != 0 && strcmp(errid, "Elimit_reached") != 0));
+		bool show_stack = strcmp(errid, "Elimit_reached") != 0;
 		string location;
 		string details;
 		get_current_line_details(&location, &details, !show_block);
@@ -146,12 +146,13 @@ static bool warned=false;
 void warn(int errid, const char * e_)
 {
 	const char* current_block = get_current_block();
+	const char* warnname = get_warning_name((asar_warning_id)errid);
 	// don't show current block if the warning came from a warn command
-	bool show_block = (current_block && (errid != warn_id_warn_command));
+	bool show_block = (current_block && (strcmp(warnname, "Wwarn_command") != 0));
 	string location;
 	string details;
 	get_current_line_details(&location, &details, !show_block);
-	string warning_string = location+"warning: (" + get_warning_name((asar_warning_id)errid) + "): " + e_;
+	string warning_string = location+"warning: (" + warnname + "): " + e_;
 	string details_string = details + get_callstack() + "\n";
 	set_text_color(errloc, &warning_string, ansi_text_color::BRIGHT_YELLOW);
 	fputs(warning_string, errloc);

src/asar/interface-cli.cpp

@@ -139,17 +139,18 @@ void error_interface(const char* errid, int whichpass, const char * e_)
 	if (ismath) matherror = e_;
 	else if (pass == whichpass) {
 		// don't show current block if the error came from an error command
-		bool show_block = (strcmp(errid, "error_command") != 0);
+		bool show_block = (strcmp(errid, "Eerror_command") != 0);
 		fillerror(errors[numerror++], errid, STR "error: (" + errid + "): ", e_, show_block);
 	}
 	else {}//ignore anything else
 }
 
 void warn(int errid, const char * str)
 {
+	const char* warnname = get_warning_name((asar_warning_id)errid);
 	// don't show current block if the warning came from a warn command
-	bool show_block = (errid != warn_id_warn_command);
-	fillerror(warnings[numwarn++], get_warning_name((asar_warning_id)errid), STR "warning: (" + get_warning_name((asar_warning_id)errid) + "): ", str, show_block);
+	bool show_block = (strcmp(warnname, "Wwarn_command") != 0);
+	fillerror(warnings[numwarn++], warnname, STR "warning: (" + warnname + "): ", str, show_block);
 }
 
 static autoarray<labeldata> ldata;

src/asar/interface-lib.cpp

@@ -1,23 +1,29 @@
 #include <vector>
+#include "libstr.h"
 
 // construct a mapping between warning ids and warning names.
 struct warn_t;
 std::vector<warn_t> all_warnings;
 int warning_id_end = 0;
 struct warn_t {
-	const char *name;
+	string name;
 	bool exists;
 	bool is_default_enabled;
 	warn_t() : name(nullptr), exists(false), is_default_enabled(false) {}
-	warn_t(int id, const char *name, bool is_default_enabled)
-	: name(name), exists(true), is_default_enabled(is_default_enabled) {
+	warn_t(int id, const char *name_in, bool is_default_enabled)
+	: exists(true), is_default_enabled(is_default_enabled) {
 		if((int)all_warnings.size() <= id) all_warnings.resize(id + 1);
+		// convert warn_xxx -> Wxxx
+		name = STR "W" + (name_in + 5);
 		all_warnings[id] = *this;
 		warning_id_end = all_warnings.size();
 	}
 };
 
-#define SAVE_WARN_NAME(id, name, is_enabled) static warn_t _useless_##id { id, name, is_enabled }
+// i love this fucking language
+#define CAT(a,b) a##b
+#define CAT2(a,b) CAT(a,b)
+#define SAVE_WARN_NAME(id, name, is_enabled) static warn_t CAT2(_useless_,__LINE__) { id, name, is_enabled }
 #include "warnings.h"
 
 #include "asar.h"
@@ -63,7 +69,7 @@ const char* get_warning_name(asar_warning_id warnid)
 	const warn_t& warning = all_warnings[warnid];
 	assert(warning.exists);
 
-	return warning.name;
+	return warning.name.data();
 }
 
 
@@ -92,7 +98,7 @@ asar_warning_id parse_warning_id_from_string(const char* string)
 	}
 	for(int i = 0; i < warning_id_end; i++)
 	{
-		if(all_warnings[i].exists && !stricmpwithlower(pos, all_warnings[i].name+1))
+		if(all_warnings[i].exists && !stricmpwithlower(pos, all_warnings[i].name.data()+1))
 		{
 			return asar_warning_id(i);
 		}

src/asar/warnings.cpp

@@ -14,29 +14,28 @@ void warn_impl(int warn_id, const char* fmt_string, int whichpass, ...);
 #endif
 
 #define WRN(id, fmt_string, is_enabled) \
-	static constexpr int warn_id_##id = __LINE__ - _warn_startline; \
-	SAVE_WARN_NAME(warn_id_##id, "W" #id, is_enabled); \
-	template<typename... Ts> inline void warn_ ## id(int whichpass, Ts... args) { \
-		warn_impl(warn_id_##id, fmt_string, whichpass, args...); \
+	SAVE_WARN_NAME(__LINE__ - _warn_startline, #id, is_enabled); \
+	template<typename... Ts> inline void id(int whichpass, Ts... args) { \
+		warn_impl(__LINE__ - _warn_startline, fmt_string, whichpass, args...); \
 	}
 
 static constexpr int _warn_startline = __LINE__;
-WRN(relative_path_used, "Relative %s path passed to asar_patch_ex() - please use absolute paths only to prevent undefined behavior!", true)
-WRN(rom_too_short, "ROM is too short to have a title. (Expected '%s')", true)
-WRN(rom_title_incorrect, "ROM title is incorrect. Expected '%s', got '%s'.", true)
-WRN(spc700_assuming_8_bit, "This opcode does not exist with 16-bit parameters, assuming 8-bit.", true)
-WRN(assuming_address_mode, "The addressing mode %s is not valid for this instruction, assuming %s.%s", true)
-WRN(set_middle_byte, "It would be wise to set the 008000 bit of this address.", true)
-WRN(freespace_leaked, "This freespace appears to be leaked.", true)
-WRN(warn_command, "warn command%s", true)
-WRN(implicitly_sized_immediate, "Implicitly sized immediate.", false)
-WRN(check_memory_file, "Accessing file '%s' which is not in memory while Wcheck_memory_file is enabled.", false)
-WRN(datasize_last_label, "Datasize used on last detected label '%s'.", true)
-WRN(datasize_exceeds_size, "Datasize exceeds 0xFFFF for label '%s'.", true)
-WRN(mapper_already_set, "A mapper has already been selected.", true)
-WRN(feature_deprecated, "DEPRECATION NOTIFICATION: Feature \"%s\" is deprecated and will be REMOVED in the future. Please update your code to conform to newer styles. Suggested work around: %s.", true)
-WRN(invalid_warning_id, "Warning '%s' (passed to %s) doesn't exist.", true)
-WRN(byte_order_mark_utf8, "UTF-8 byte order mark detected and skipped.", true)
+WRN(warn_relative_path_used, "Relative %s path passed to asar_patch_ex() - please use absolute paths only to prevent undefined behavior!", true)
+WRN(warn_rom_too_short, "ROM is too short to have a title. (Expected '%s')", true)
+WRN(warn_rom_title_incorrect, "ROM title is incorrect. Expected '%s', got '%s'.", true)
+WRN(warn_spc700_assuming_8_bit, "This opcode does not exist with 16-bit parameters, assuming 8-bit.", true)
+WRN(warn_assuming_address_mode, "The addressing mode %s is not valid for this instruction, assuming %s.%s", true)
+WRN(warn_set_middle_byte, "It would be wise to set the 008000 bit of this address.", true)
+WRN(warn_freespace_leaked, "This freespace appears to be leaked.", true)
+WRN(warn_warn_command, "warn command%s", true)
+WRN(warn_implicitly_sized_immediate, "Implicitly sized immediate.", false)
+WRN(warn_check_memory_file, "Accessing file '%s' which is not in memory while Wcheck_memory_file is enabled.", false)
+WRN(warn_datasize_last_label, "Datasize used on last detected label '%s'.", true)
+WRN(warn_datasize_exceeds_size, "Datasize exceeds 0xFFFF for label '%s'.", true)
+WRN(warn_mapper_already_set, "A mapper has already been selected.", true)
+WRN(warn_feature_deprecated, "DEPRECATION NOTIFICATION: Feature \"%s\" is deprecated and will be REMOVED in the future. Please update your code to conform to newer styles. Suggested work around: %s.", true)
+WRN(warn_invalid_warning_id, "Warning '%s' (passed to %s) doesn't exist.", true)
+WRN(warn_byte_order_mark_utf8, "UTF-8 byte order mark detected and skipped.", true)
 
 #undef WRN
 #define throw_warning(whichpass, id, ...) id(whichpass, ## __VA_ARGS__)