From a0982130537f821d4e4ad73dec9d87ec2f59cf22 Mon Sep 17 00:00:00 2001
From: Rangi42 <remy.oukaour+rangi42@gmail.com>
Date: Sun, 1 Sep 2024 13:00:04 -0400
Subject: [PATCH] Rearrange switches so default cases are last

---
 src/asm/format.cpp | 16 ++++++++--------
 src/asm/lexer.cpp  | 16 ++++++++--------
 src/asm/output.cpp | 16 ++++++++--------
 3 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/asm/format.cpp b/src/asm/format.cpp
index 0bce7eb9..4fc04493 100644
--- a/src/asm/format.cpp
+++ b/src/asm/format.cpp
@@ -119,14 +119,6 @@ static std::string escapeString(std::string const &str) {
 	for (char c : str) {
 		// Escape characters that need escaping
 		switch (c) {
-		case '\\':
-		case '"':
-		case '{':
-			escaped += '\\';
-			[[fallthrough]];
-		default:
-			escaped += c;
-			break;
 		case '\n':
 			escaped += "\\n";
 			break;
@@ -139,6 +131,14 @@ static std::string escapeString(std::string const &str) {
 		case '\0':
 			escaped += "\\0";
 			break;
+		case '\\':
+		case '"':
+		case '{':
+			escaped += '\\';
+			[[fallthrough]];
+		default:
+			escaped += c;
+			break;
 		}
 	}
 	return escaped;
diff --git a/src/asm/lexer.cpp b/src/asm/lexer.cpp
index 1f6bd20a..507cfa3e 100644
--- a/src/asm/lexer.cpp
+++ b/src/asm/lexer.cpp
@@ -1257,14 +1257,6 @@ static void appendEscapedString(std::string &str, std::string const &escape) {
 	for (char c : escape) {
 		// Escape characters that need escaping
 		switch (c) {
-		case '\\':
-		case '"':
-		case '{':
-			str += '\\';
-			[[fallthrough]];
-		default:
-			str += c;
-			break;
 		case '\n':
 			str += "\\n";
 			break;
@@ -1277,6 +1269,14 @@ static void appendEscapedString(std::string &str, std::string const &escape) {
 		case '\0':
 			str += "\\0";
 			break;
+		case '\\':
+		case '"':
+		case '{':
+			str += '\\';
+			[[fallthrough]];
+		default:
+			str += c;
+			break;
 		}
 	}
 }
diff --git a/src/asm/output.cpp b/src/asm/output.cpp
index d92e6ef7..2bff7a76 100644
--- a/src/asm/output.cpp
+++ b/src/asm/output.cpp
@@ -360,14 +360,6 @@ static void dumpString(std::string const &escape, FILE *file) {
 	for (char c : escape) {
 		// Escape characters that need escaping
 		switch (c) {
-		case '\\':
-		case '"':
-		case '{':
-			putc('\\', file);
-			[[fallthrough]];
-		default:
-			putc(c, file);
-			break;
 		case '\n':
 			fputs("\\n", file);
 			break;
@@ -380,6 +372,14 @@ static void dumpString(std::string const &escape, FILE *file) {
 		case '\0':
 			fputs("\\0", file);
 			break;
+		case '\\':
+		case '"':
+		case '{':
+			putc('\\', file);
+			[[fallthrough]];
+		default:
+			putc(c, file);
+			break;
 		}
 	}
 }