Skip to content

Commit 896a8eb

Browse files
committed
Rename 'supe: parser.Macro' to 'macro'
1 parent 1e2fecb commit 896a8eb

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

Tools/cases_generator/generate_cases.py

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -562,9 +562,8 @@ def analyze_super(self, supe: parser.Super) -> SuperInstruction:
562562
final_sp = sp
563563
return SuperInstruction(supe, stack, initial_sp, final_sp, parts)
564564

565-
# TODO: Rename 'supe: parser.Macro' to 'macro: parser.Macro' everywhere
566-
def analyze_macro(self, supe: parser.Macro) -> MacroInstruction:
567-
components = self.check_macro_components(supe)
565+
def analyze_macro(self, macro: parser.Macro) -> MacroInstruction:
566+
components = self.check_macro_components(macro)
568567
stack, initial_sp = self.stack_analysis(components)
569568
sp = initial_sp
570569
parts: list[Component | parser.CacheEffect] = []
@@ -587,7 +586,7 @@ def analyze_macro(self, supe: parser.Macro) -> MacroInstruction:
587586
case _:
588587
typing.assert_never(component)
589588
final_sp = sp
590-
return MacroInstruction(supe, stack, initial_sp, final_sp, parts)
589+
return MacroInstruction(macro, stack, initial_sp, final_sp, parts)
591590

592591
def check_super_components(self, supe: parser.Super) -> list[Instruction]:
593592
components: list[Instruction] = []
@@ -601,16 +600,16 @@ def check_super_components(self, supe: parser.Super) -> list[Instruction]:
601600
return components
602601

603602
def check_macro_components(
604-
self, supe: parser.Macro
603+
self, macro: parser.Macro
605604
) -> list[InstructionOrCacheEffect]:
606605
components: list[InstructionOrCacheEffect] = []
607-
if not supe.uops:
608-
self.error(f"Macro instruction has no operands", supe)
609-
for uop in supe.uops:
606+
if not macro.uops:
607+
self.error(f"Macro instruction has no operands", macro)
608+
for uop in macro.uops:
610609
match uop:
611610
case parser.OpName(name):
612611
if name not in self.instrs:
613-
self.error(f"Unknown instruction {name!r}", supe)
612+
self.error(f"Unknown instruction {name!r}", macro)
614613
components.append(self.instrs[name])
615614
case parser.CacheEffect():
616615
components.append(uop)

0 commit comments

Comments
 (0)