From 20b2f5ee2f7cfe8f100c30b6ff6236e63daf76be Mon Sep 17 00:00:00 2001
From: ISSOtm <eldredhabert0@gmail.com>
Date: Sun, 1 Sep 2019 03:42:50 +0200
Subject: [PATCH] Fix incorrect line numbers with some IF blocks If a line
 ended with a string's closing quote, or a newline escape, then skipping over
 that line via IF/ELIF/ELSE would fail to count that line, offsetting the rest
 of the file. I have no idea why but for some reason 9829be1 changed
 *specifically* `if_skip_to_else` to have incorrect behavior on string
 endings. The incorrect behavior on newline escapes seems to have been here
 since the beginning. Also added a test to check for both of those behaviors
 in both functions.

Honestly, it baffles me that nobody ever noticed. I didn't until I started
working on #395.
---
 src/asm/asmy.y                        | 37 +++++++++------------------
 test/asm/correct-line-number.asm      | 11 ++++++++
 test/asm/correct-line-number.out      |  4 +++
 test/asm/correct-line-number.out.pipe |  4 +++
 test/asm/multiple-charmaps.out        |  2 +-
 test/asm/multiple-charmaps.out.pipe   |  2 +-
 6 files changed, 33 insertions(+), 27 deletions(-)
 create mode 100644 test/asm/correct-line-number.asm
 create mode 100644 test/asm/correct-line-number.out
 create mode 100644 test/asm/correct-line-number.out.pipe

diff --git a/src/asm/asmy.y b/src/asm/asmy.y
index 3257b8d1..bf7c0d74 100644
--- a/src/asm/asmy.y
+++ b/src/asm/asmy.y
@@ -354,20 +354,14 @@ static void if_skip_to_else(void)
 				src++;
 			}
 		} else {
-			switch (*src) {
-			case '\\':
-				src += 2;
-				break;
-
-			case '\"':
-				src += 2;
+			if (*src == '\"') {
 				inString = false;
-				break;
-
-			default:
-				src++;
-				break;
+			} else if (*src == '\\') {
+				/* Escaped quotes don't end the string */
+				if (*++src != '\"')
+					src--;
 			}
+			src++;
 		}
 	}
 
@@ -405,21 +399,14 @@ static void if_skip_to_endc(void)
 				src++;
 			}
 		} else {
-			switch (*src) {
-
-			case '\\':
-				src += 2;
-				break;
-
-			case '\"':
-				src++;
+			if (*src == '\"') {
 				inString = false;
-				break;
-
-			default:
-				src++;
-				break;
+			} else if (*src == '\\') {
+				/* Escaped quotes don't end the string */
+				if (*++src != '\"')
+					src--;
 			}
+			src++;
 		}
 	}
 
diff --git a/test/asm/correct-line-number.asm b/test/asm/correct-line-number.asm
new file mode 100644
index 00000000..9c672a51
--- /dev/null
+++ b/test/asm/correct-line-number.asm
@@ -0,0 +1,11 @@
+IF 0
+	"\
+	"
+ELIF 1
+	WARN "Am I geting ahead of myself?"
+ELSE
+	"\
+	"
+ENDC
+
+WARN "Hopefully not."
\ No newline at end of file
diff --git a/test/asm/correct-line-number.out b/test/asm/correct-line-number.out
new file mode 100644
index 00000000..34e07cae
--- /dev/null
+++ b/test/asm/correct-line-number.out
@@ -0,0 +1,4 @@
+warning: correct-line-number.asm(5):
+    Am I geting ahead of myself?
+warning: correct-line-number.asm(11):
+    Hopefully not.
diff --git a/test/asm/correct-line-number.out.pipe b/test/asm/correct-line-number.out.pipe
new file mode 100644
index 00000000..4c172022
--- /dev/null
+++ b/test/asm/correct-line-number.out.pipe
@@ -0,0 +1,4 @@
+warning: -(5):
+    Am I geting ahead of myself?
+warning: -(11):
+    Hopefully not.
diff --git a/test/asm/multiple-charmaps.out b/test/asm/multiple-charmaps.out
index 4be67109..5cf76894 100644
--- a/test/asm/multiple-charmaps.out
+++ b/test/asm/multiple-charmaps.out
@@ -1,6 +1,6 @@
 warning: multiple-charmaps.asm(75):
     Using 'charmap' within a section when the current charmap is 'main' is deprecated
-ERROR: multiple-charmaps.asm(100) -> new_(5):
+ERROR: multiple-charmaps.asm(100) -> new_(6):
     Charmap 'map1' already exists
 ERROR: multiple-charmaps.asm(102) -> set_(2):
     Charmap 'map5' doesn't exist
diff --git a/test/asm/multiple-charmaps.out.pipe b/test/asm/multiple-charmaps.out.pipe
index 7d6126a7..78278aa2 100644
--- a/test/asm/multiple-charmaps.out.pipe
+++ b/test/asm/multiple-charmaps.out.pipe
@@ -1,6 +1,6 @@
 warning: -(75):
     Using 'charmap' within a section when the current charmap is 'main' is deprecated
-ERROR: -(100) -> new_(5):
+ERROR: -(100) -> new_(6):
     Charmap 'map1' already exists
 ERROR: -(102) -> set_(2):
     Charmap 'map5' doesn't exist