@@ -562,9 +562,8 @@ def analyze_super(self, supe: parser.Super) -> SuperInstruction:
562
562
final_sp = sp
563
563
return SuperInstruction (supe , stack , initial_sp , final_sp , parts )
564
564
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 )
568
567
stack , initial_sp = self .stack_analysis (components )
569
568
sp = initial_sp
570
569
parts : list [Component | parser .CacheEffect ] = []
@@ -587,7 +586,7 @@ def analyze_macro(self, supe: parser.Macro) -> MacroInstruction:
587
586
case _:
588
587
typing .assert_never (component )
589
588
final_sp = sp
590
- return MacroInstruction (supe , stack , initial_sp , final_sp , parts )
589
+ return MacroInstruction (macro , stack , initial_sp , final_sp , parts )
591
590
592
591
def check_super_components (self , supe : parser .Super ) -> list [Instruction ]:
593
592
components : list [Instruction ] = []
@@ -601,16 +600,16 @@ def check_super_components(self, supe: parser.Super) -> list[Instruction]:
601
600
return components
602
601
603
602
def check_macro_components (
604
- self , supe : parser .Macro
603
+ self , macro : parser .Macro
605
604
) -> list [InstructionOrCacheEffect ]:
606
605
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 :
610
609
match uop :
611
610
case parser .OpName (name ):
612
611
if name not in self .instrs :
613
- self .error (f"Unknown instruction { name !r} " , supe )
612
+ self .error (f"Unknown instruction { name !r} " , macro )
614
613
components .append (self .instrs [name ])
615
614
case parser .CacheEffect ():
616
615
components .append (uop )
0 commit comments