Makes provision for pretty-printed key names.

i.e. keys that don't fit C++ naming rules.

Processors/Z80/State/State.cpp

@@ -195,6 +195,18 @@ State::Registers::Registers() {
 	}
 }
 
+std::unordered_map<std::string, std::string> State::Registers::pretty_names() const {
+	return {
+		{ "afDash", "af'" },
+		{ "bcDash", "bc'" },
+		{ "deDash", "de'" },
+		{ "hlDash", "hl'" },
+		{ "program_counter", "pc" },
+		{ "stack_pointer", "sp" },
+		{ "interrupt_mode", "im" },
+	};
+}
+
 State::ExecutionState::ExecutionState() {
 	if(needs_declare()) {
 		DeclareField(is_halted);

Processors/Z80/State/State.hpp

@@ -38,6 +38,8 @@ struct State: public Reflection::StructImpl<State> {
 		int interrupt_mode;
 		bool iff1, iff2;
 
+		std::unordered_map<std::string, std::string> pretty_names() const override;
+
 		Registers();
 	} registers;
 

Reflection/Struct.cpp

@@ -205,6 +205,7 @@ void Reflection::Struct::append(std::ostringstream &stream, const std::string &k
 
 std::string Reflection::Struct::description() const {
 	std::ostringstream stream;
+	const auto name_map = pretty_names();
 
 	stream << "{";
 
@@ -212,7 +213,10 @@ std::string Reflection::Struct::description() const {
 	for(const auto &key: all_keys()) {
 		if(!is_first) stream << ", ";
 		is_first = false;
-		stream << key << ": ";
+
+		// Use the pretty name for this key, if defined.
+		const auto mapped_key = name_map.find(key);
+		stream << (mapped_key != name_map.end() ? mapped_key->second : key) << ": ";
 
 		const auto count = count_of(key);
 		const auto type = type_of(key);

Reflection/Struct.hpp

@@ -27,6 +27,14 @@ namespace Reflection {
 #define DeclareField(Name) declare(&Name, #Name)
 
 struct Struct {
+	/*!
+		Maps from internal key names to more human-friendly ones; e.g. might contain
+		a mapping from afDash to af'.
+	*/
+	virtual std::unordered_map<std::string, std::string> pretty_names() const {
+		return {};
+	}
+
 	virtual std::vector<std::string> all_keys() const = 0;
 	virtual const std::type_info *type_of(const std::string &name) const = 0;
 	virtual size_t count_of(const std::string &name) const = 0;