Fix assembler output for branches + debugging operations

Fixes: #142

CHANGELOG.md

@@ -8,6 +8,11 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 Nothing yet!
 
 
+## [1.0.6] - 2021-01-13
+### Fixed
+- The assembler produces correct offsets for branches in the presence of debugging operations.
+
+
 ## [1.0.5] - 2020-12-??
 ### Fixed
 - The assembler no longer produces code for debugging instructions like `print_reg`.

hera/checker.py

@@ -24,14 +24,14 @@
     Token,
 )
 from .op import (
+    LABEL,
+    RTI,
+    SWI,
+    AbstractOperation,
     DataOperation,
     DebuggingOperation,
-    AbstractOperation,
     RegisterBranch,
     RelativeBranch,
-    LABEL,
-    RTI,
-    SWI,
 )
 from .utils import out_of_range
 
@@ -65,6 +65,12 @@ def check(
         if isinstance(op, DataOperation):
             data.append(op)
         else:
+            if isinstance(op, DebuggingOperation) and settings.mode in (
+                "assemble",
+                "preprocess",
+            ):
+                continue
+
             code.append(op)
 
     return (Program(data, code, symbol_table, debug_info), messages)
@@ -175,6 +181,10 @@ def get_labels(
                     dc += op.args[0]
                 elif op.args[0] in constants:
                     dc += constants[op.args[0]]
+        elif settings.mode in ("assemble", "preprocess") and isinstance(
+            op, DebuggingOperation
+        ):
+            continue
         else:
             pc += operation_length(op)
 

test/assets/asm/branch_label.hera

@@ -0,0 +1,4 @@
+BR(l)
+print("Hello, world") // This should not affect the branch offset.
+ADD(R0, R0, R0)
+LABEL(l)

test/assets/asm/branch_label.hera.lcode

@@ -0,0 +1,4 @@
+eb04
+fb00
+100b
+a000

test/test_assembler.py

@@ -1,5 +1,5 @@
-from unittest.mock import patch
 from io import StringIO
+from unittest.mock import patch
 
 from hera.main import main
 
@@ -34,6 +34,16 @@ def test_assemble_branch(capsys):
         assert captured.out == f.read()
 
 
+def test_assemble_labelled_branch(capsys):
+    main(["assemble", "--code", "--stdout", "test/assets/asm/branch_label.hera"])
+
+    captured = capsys.readouterr()
+    assert captured.err == ""
+
+    with open("test/assets/asm/branch_label.hera.lcode") as f:
+        assert captured.out == f.read()
+
+
 def test_assemble_relative_branch(capsys):
     main(["assemble", "--code", "--stdout", "test/assets/asm/rel_branch.hera"])