Warn about leftover merge conflict markers

Rangi42 · Oct 22, 2024 · c6e6b46 · c6e6b46
1 parent f048cbb
commit c6e6b46
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 1 deletion.
diff --git a/src/asm/parser.y b/src/asm/parser.y
@@ -420,10 +420,29 @@ diff_mark:
 	}
 ;
 
+merge_conflict:
+	OP_SHL OP_SHL OP_SHL OP_LOGICLT {
+		::error(
+			"syntax error, unexpected <<<<<<< line (is it a leftover merge conflict mark?)\n"
+		);
+	}
+	| OP_USHR OP_USHR OP_LOGICGT {
+		::error(
+			"syntax error, unexpected >>>>>>> line (is it a leftover merge conflict mark?)\n"
+		);
+	}
+	| OP_LOGICEQU OP_LOGICEQU OP_LOGICEQU POP_EQUAL {
+		::error(
+			"syntax error, unexpected ======= line (is it a leftover merge conflict mark?)\n"
+		);
+	}
+;
+
 // Lines and line directives.
 
 line:
 	  plain_directive endofline
+	| merge_conflict endofline
 	| line_directive // Directives that manage newlines themselves
 	// Continue parsing the next line on a syntax error
 	| error {

diff --git a/test/asm/diff-marks.asm b/test/asm/diff-marks.asm
@@ -1,3 +1,10 @@
 SECTION "test", ROM0
 -	ld a, 0
 +	xor a
+<<<<<<<
+	ld a, 0
+=======
+	xor a
+>>>>>>>
++<<<<<<<
+->>>>>>>
diff --git a/test/asm/diff-marks.err b/test/asm/diff-marks.err
@@ -2,4 +2,18 @@ error: diff-marks.asm(2):
     syntax error, unexpected - at the beginning of the line (is it a leftover diff mark?)
 error: diff-marks.asm(3):
     syntax error, unexpected + at the beginning of the line (is it a leftover diff mark?)
-error: Assembly aborted (2 errors)!
+error: diff-marks.asm(4):
+    syntax error, unexpected <<<<<<< line (is it a leftover merge conflict mark?)
+error: diff-marks.asm(6):
+    syntax error, unexpected ======= line (is it a leftover merge conflict mark?)
+error: diff-marks.asm(8):
+    syntax error, unexpected >>>>>>> line (is it a leftover merge conflict mark?)
+error: diff-marks.asm(9):
+    syntax error, unexpected + at the beginning of the line (is it a leftover diff mark?)
+error: diff-marks.asm(9):
+    syntax error, unexpected <<<<<<< line (is it a leftover merge conflict mark?)
+error: diff-marks.asm(10):
+    syntax error, unexpected - at the beginning of the line (is it a leftover diff mark?)
+error: diff-marks.asm(10):
+    syntax error, unexpected >>>>>>> line (is it a leftover merge conflict mark?)
+error: Assembly aborted (9 errors)!