fix: strings only containing ':' being treated as labels

jumanji144 · Jul 28, 2024 · 511cdb4 · 511cdb4
1 parent b88d649
commit 511cdb4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/jasm-core/src/main/java/me/darknet/assembler/parser/DeclarationParser.java b/jasm-core/src/main/java/me/darknet/assembler/parser/DeclarationParser.java
@@ -357,7 +357,7 @@ private ASTInstruction parseInstruction() {
             ctx.throwEofError("instruction argument or label");
             return null;
         }
-        if (peek.content().equals(":")) {
+        if (peek.type() == TokenType.OPERATOR && peek.content().equals(":")) {
             ctx.leaveState(State.IN_INSTRUCTION);
             ctx.take(":");
             return new ASTLabel(new ASTIdentifier(instruction));

diff --git a/jasm-core/src/test/java/me/darknet/assembler/ASTProcessorTest.java b/jasm-core/src/test/java/me/darknet/assembler/ASTProcessorTest.java
@@ -1,8 +1,7 @@
 package me.darknet.assembler;
 
 import me.darknet.assembler.ast.ASTElement;
-import me.darknet.assembler.ast.primitive.ASTArray;
-import me.darknet.assembler.ast.primitive.ASTIdentifier;
+import me.darknet.assembler.ast.primitive.*;
 import me.darknet.assembler.ast.specific.*;
 import me.darknet.assembler.error.Error;
 import me.darknet.assembler.error.Result;

diff --git a/jasm-core/src/test/java/me/darknet/assembler/InstructionsTest.java b/jasm-core/src/test/java/me/darknet/assembler/InstructionsTest.java
@@ -168,4 +168,16 @@ public void testLookupSwitch() {
         );
     }
 
+    @Test
+    public void testWeirdStrings() {
+        assertCode(
+                new String[] { "ldc \":\"" }, BytecodeFormat.JVM, (code) -> {
+                    List<ASTInstruction> instructions = code.instructions();
+                    assertEquals(1, instructions.size());
+                    assertEquals("ldc", instructions.get(0).identifier().content());
+                    assertEquals(":", instructions.get(0).arguments().get(0).content());
+                }
+        );
+    }
+
 }