fix #216: allow matching pattern whitespace at end of instruction inv…

…ocation
hlorenzi · Feb 1, 2025 · a48d22b · a48d22b
1 parent d524b97
commit a48d22b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/src/asm/matcher/mod.rs b/src/asm/matcher/mod.rs
@@ -586,7 +586,8 @@ fn match_with_rule<'src>(
 
             asm::RulePatternPart::Whitespace =>
             {
-                if walker.next_token().kind != syntax::TokenKind::Whitespace
+                if !walker.is_over() &&
+                    walker.next_token().kind != syntax::TokenKind::Whitespace
                 {
                     return vec![];
                 }

diff --git a/tests/issue216/ok.asm b/tests/issue216/ok.asm
@@ -0,0 +1,16 @@
+#subruledef acc {
+    a => 0xaa
+    b => 0xbb
+}
+
+#subruledef paropts {
+    {} => 0x00
+    FOO => 0x01
+}
+
+#ruledef {
+    abs {reg: acc} {p: paropts} => 0xee @ reg @ p
+}
+
+abs a FOO ; = 0xeeaa01
+abs a ; = 0xeeaa00