@@ -590,39 +590,39 @@ def _to(self):
590590 # someone finds a script that actually requires supporting it
591591
592592 def _plus (self ):
593- ( p1 , p2 ) = self .operands
593+ p1 , p2 = self .operands
594594 if p1 .type == ParamType .Var or p2 .type == ParamType .Var :
595595 return [p1 , " + " , p2 ]
596596 elif p1 .type == ParamType .Str or p2 .type == ParamType .Str :
597597 raise NotImplementedError ("Plus() expected numeric type" )
598598 return [Param (value = p1 .value + p2 .value )]
599599
600600 def _minus (self ):
601- ( p1 , p2 ) = self .operands
601+ p1 , p2 = self .operands
602602 if p1 .type == ParamType .Var or p2 .type == ParamType .Var :
603603 return [p1 , " - " , p2 ]
604604 elif p1 .type == ParamType .Str or p2 .type == ParamType .Str :
605605 raise NotImplementedError ("Minus() expected numeric type" )
606606 return [Param (value = p1 .value - p2 .value )]
607607
608608 def _mul (self ):
609- ( p1 , p2 ) = self .operands
609+ p1 , p2 = self .operands
610610 if p1 .type == ParamType .Var or p2 .type == ParamType .Var :
611611 return [p1 , " * " , p2 ]
612612 elif p1 .type == ParamType .Str or p2 .type == ParamType .Str :
613613 raise NotImplementedError ("Mul() expected numeric type" )
614614 return [Param (value = p1 .value * p2 .value )]
615615
616616 def _div (self ):
617- ( p1 , p2 ) = self .operands
617+ p1 , p2 = self .operands
618618 if p1 .type == ParamType .Var or p2 .type == ParamType .Var :
619619 return [p1 , " / " , p2 ]
620620 elif p1 .type == ParamType .Str or p2 .type == ParamType .Str :
621621 raise NotImplementedError ("Div() expected numeric type" )
622622 return [Param (value = p1 .value / p2 .value )]
623623
624624 def _mod (self ):
625- ( p1 , p2 ) = self .operands
625+ p1 , p2 = self .operands
626626 if p1 .type == ParamType .Var or p2 .type == ParamType .Var :
627627 return [p1 , " % " , p2 ]
628628 elif p1 .type == ParamType .Str or p2 .type == ParamType .Str :
@@ -631,7 +631,7 @@ def _mod(self):
631631
632632 def _or (self ):
633633 # LiveMaker uses | to specify both bitwise and boolean OR
634- ( p1 , p2 ) = self .operands
634+ p1 , p2 = self .operands
635635 if p1 .type == ParamType .Var or p2 .type == ParamType .Var :
636636 return ["(" , p1 , " | " , p2 , ")" ]
637637 elif p1 .type == ParamType .Str or p2 .type == ParamType .Str :
@@ -642,7 +642,7 @@ def _or(self):
642642
643643 def _and (self ):
644644 # LiveMaker uses | to specify both bitwise and boolean AND
645- ( p1 , p2 ) = self .operands
645+ p1 , p2 = self .operands
646646 if p1 .type == ParamType .Var or p2 .type == ParamType .Var :
647647 return ["(" , p1 , " & " , p2 , ")" ]
648648 elif p1 .type == ParamType .Str or p2 .type == ParamType .Str :
@@ -652,7 +652,7 @@ def _and(self):
652652 return [p1 .value & p2 .value ]
653653
654654 def _xor (self ):
655- ( p1 , p2 ) = self .operands
655+ p1 , p2 = self .operands
656656 if p1 .type == ParamType .Var or p2 .type == ParamType .Var :
657657 return [p1 , " ^ " , p2 ]
658658 elif p1 .type == ParamType .Str or p2 .type == ParamType .Str :
@@ -676,45 +676,45 @@ def _func(self):
676676 return x
677677
678678 def _equal (self ):
679- ( p1 , p2 ) = self .operands
679+ p1 , p2 = self .operands
680680 if p1 .type == ParamType .Var or p2 .type == ParamType .Var :
681681 return [p1 , " == " , p2 ]
682682 return [Param (value = p1 .value == p2 .value )]
683683
684684 def _big (self ):
685- ( p1 , p2 ) = self .operands
685+ p1 , p2 = self .operands
686686 if p1 .type == ParamType .Var or p2 .type == ParamType .Var :
687687 return [p1 , " > " , p2 ]
688688 return [Param (value = p1 .value > p2 .value )]
689689
690690 def _small (self ):
691- ( p1 , p2 ) = self .operands
691+ p1 , p2 = self .operands
692692 if p1 .type == ParamType .Var or p2 .type == ParamType .Var :
693693 return [p1 , " < " , p2 ]
694694 return [Param (value = p1 .value < p2 .value )]
695695
696696 def _ebig (self ):
697- ( p1 , p2 ) = self .operands
697+ p1 , p2 = self .operands
698698 if p1 .type == ParamType .Var or p2 .type == ParamType .Var :
699699 return [p1 , " >= " , p2 ]
700700 return [Param (value = p1 .value >= p2 .value )]
701701
702702 def _esmall (self ):
703- ( p1 , p2 ) = self .operands
703+ p1 , p2 = self .operands
704704 if p1 .type == ParamType .Var or p2 .type == ParamType .Var :
705705 return [p1 , " <= " , p2 ]
706706 return [Param (value = p1 .value <= p2 .value )]
707707
708708 def _shiftl (self ):
709- ( p1 , p2 ) = self .operands
709+ p1 , p2 = self .operands
710710 if p1 .type == ParamType .Var or p2 .type == ParamType .Var :
711711 return [p1 , " << " , p2 ]
712712 elif p1 .type == ParamType .Str or p2 .type == ParamType .Str :
713713 raise NotImplementedError ("ShiftL() expected numeric type" )
714714 return [Param (p1 .value << p2 .value )]
715715
716716 def _shiftr (self ):
717- ( p1 , p2 ) = self .operands
717+ p1 , p2 = self .operands
718718 if p1 .type == ParamType .Var or p2 .type == ParamType .Var :
719719 return [p1 , " >> " , p2 ]
720720 elif p1 .type == ParamType .Str or p2 .type == ParamType .Str :
@@ -723,15 +723,15 @@ def _shiftr(self):
723723
724724 def _combostr (self ):
725725 # String join
726- ( p1 , p2 ) = self .operands
726+ p1 , p2 = self .operands
727727 if p1 .type == ParamType .Var or p2 .type == ParamType .Var :
728728 return [p1 , " ++ " , p2 ]
729729 elif p1 .type != ParamType .Str or p2 .type != ParamType .Str :
730730 raise NotImplementedError ("ComboStr() expected string type" )
731731 return [Param (value = "" .join ([p1 .value , p2 .value ]))]
732732
733733 def _nequal (self ):
734- ( p1 , p2 ) = self .operands
734+ p1 , p2 = self .operands
735735 if p1 .type == ParamType .Var or p2 .type == ParamType .Var :
736736 return [p1 , " != " , p2 ]
737737 return [Param (value = p1 .value != p2 .value )]
0 commit comments