fix labels

Author: logicplace

scripts/asm/__init__.py

@@ -11,17 +11,22 @@ def parse(self, parser):
 
 		args = [parser.parse_expression()]
 
+		if parser.stream.skip_if("comma"):
+			args.append(parser.parse_expression())
+		else:
+			args.append(nodes.Const(0))
+
 		body = parser.parse_statements(
 			["name:endasm"], drop_needle=True)
 
 		return nodes.CallBlock(
             self.call_method("_highlight", args), [], [], body
         ).set_lineno(lineno)
 
-	def _highlight(self, mode: str, caller):
+	def _highlight(self, mode: str, digits: int, caller):
 		if mode == "epson":
 			from asm.epson import render
 		else:
 			raise ValueError(mode)
 
-		return render(caller())
+		return render(caller(), digits=digits)

scripts/asm/common.py

@@ -75,6 +75,9 @@ def __init__(self) -> None:
 	def render(self):
 		return ""
 
+	def __bool__(self):
+		return False
+
 @dataclass
 class Line:
 	label: AccentedData
@@ -149,7 +152,7 @@ def lines(x) -> Sequence[str]:
 
 
 class Renderer:
-	def __init__(self, use_positions=False) -> None:
+	def __init__(self, use_positions=0) -> None:
 		self.prefixes: list[str] = []
 		self.lines: list[Line] = []
 		self.label_anchors: dict[int,str] = {}
@@ -175,7 +178,7 @@ def queue(self, line: Line) -> None:
 		else:
 			if self.use_positions:
 				if isinstance(line, (OperatorLine, DirectiveLine)) and line.position >= 0:
-					pos = f"{line.position:06X}"
+					pos = f"{line.position:0{self.use_positions}X}"
 					self.prefix_anchors[self.cur_line] = pos
 					self.prefixes.append(f"${pos}")
 				else:
@@ -187,6 +190,7 @@ def queue(self, line: Line) -> None:
 					if self.preroll_start < 0
 					else self.preroll_start
 				] = str(line.label)
+				self.preroll_start = -1
 
 		self.lines.append(line)
 		self.cur_line += 1
@@ -195,7 +199,12 @@ def render(self) -> str:
 		res = '<pre><code class="language-s1c88 hljs">'
 		longest = max(len(x) for x in self.prefixes)
 		prefix_class = 'color="#6e7781" class="line-number"'
-		for i, (p, l) in enumerate(zip(self.prefixes, self.lines)):
+		if self.use_positions:
+			lines = zip(self.prefixes, self.lines)
+		else:
+			lines = self.lines
+
+		for i, (p, l) in enumerate(lines):
 			if p:
 				if i in self.prefix_anchors:
 					name = _id(self.prefix_anchors[i])

scripts/asm/epson/__init__.py

@@ -136,7 +136,7 @@ def identify_arg_type(arg: str, *, index_ok=True):
 
 	raise ValueError(f"unknown argument type: '{arg}'")
 
-def process_epson(code, *, position=0) -> Renderer:
+def process_epson(code, *, position=0, digits=6) -> Renderer:
 	cont = ""
 	macros = defaultdict(set)
 	macro_sizes = defaultdict(int)
@@ -149,7 +149,7 @@ def macro_or_op(x: str):
 			return "title.function"
 		return "keyword"
 
-	renderer = Renderer(position >= 0)
+	renderer = Renderer(digits)
 
 	for line in lines(code):
 		# TODO: remember and restore break points
@@ -312,6 +312,6 @@ def macro_or_op(x: str):
 	return renderer
 
 
-def render(code, *, position=0) -> str:
-	renderer = process_epson(code, position=position)
+def render(code, *, position=0, digits=6) -> str:
+	renderer = process_epson(code, position=position, digits=digits)
 	return renderer.render()