Skip to content

Commit 974a2ae

Browse files
author
Vance Palacio
committed
Fix function naming convention
1 parent a33d40f commit 974a2ae

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

textbeat/player.py

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1810,21 +1810,21 @@ def read_operands(cmd) -> tuple[str,str]:
18101810
op='='
18111811
return (val,op)
18121812

1813-
def handleDivision(var, val):
1813+
def handle_division(var, val):
18141814
"""Use /= to modify a global variable"""
18151815
if var in 'GX': self.grid/=float(val)
18161816
elif var=='N': self.grid/=float(val) #!
18171817
elif var=='T': self.tempo/=float(val)
18181818
else: assert False
18191819

1820-
def handleMultiply(var, val):
1820+
def handle_multiply(var, val):
18211821
"""Use *= to modify a global variable"""
18221822
if var in 'GX': self.grid*=float(val)
18231823
elif var=='N': self.grid*=float(val) #!
18241824
elif var=='T': self.tempo*=float(val)
18251825
else: assert False
18261826

1827-
def handleAdd(var, val):
1827+
def handle_add(var, val):
18281828
"""Use += to modify a global variable"""
18291829
if var=='K': self.transpose += note_offset('#1' if val=='+' else val)
18301830
# elif var=='O': self.octave += int(1 if val=='+' else val)
@@ -1835,7 +1835,7 @@ def handleAdd(var, val):
18351835
# self.octave += -1*sgn(self.transpose)*(self.transpose//12)
18361836
# self.transpose = self.transpose%12
18371837

1838-
def handleSub(var, val):
1838+
def handle_sub(var, val):
18391839
"""Use -= to modify a global variable"""
18401840
if var=='K':
18411841
self.transpose -= note_offset(val)
@@ -1849,7 +1849,7 @@ def handleSub(var, val):
18491849
# self.octave += -1*sgn(self.transpose)*(self.transpose//12)
18501850
# self.transpose = self.transpose%12
18511851

1852-
def handleAssign(var, val):
1852+
def handle_assign(var, val):
18531853
"""Use = to modify a global variable"""
18541854
if var in 'GX': self.grid=float(val)
18551855
elif var=='R':
@@ -1943,7 +1943,7 @@ def handleAssign(var, val):
19431943
pass
19441944
else: assert False # no such var
19451945

1946-
def adjustOperands(val: str, op:str) -> tuple[str,str]:
1946+
def adjust_operands(val: str, op:str) -> tuple[str,str]:
19471947
val = op + val # append
19481948
# TODO: add numbers after dots like other ops
19491949
if val[0]=='.':
@@ -1970,17 +1970,16 @@ def adjustOperands(val: str, op:str) -> tuple[str,str]:
19701970
if var in 'TGXNPSRCKFDR': # global vars %
19711971
cmd = tok.split(' ')[0]
19721972
(val,op) = read_operands(cmd)
1973-
if not val or op=='.': (val,op) = adjustOperands(val,op)
1973+
if not val or op=='.': (val,op) = adjust_operands(val,op)
19741974

1975-
if op=='/': handleDivision(var,val)
1976-
elif op=='*': handleMultiply(var,val)
1977-
elif op=='+': handleAdd(var,val)
1978-
elif op=='-': handleSub(var,val)
1979-
elif op=='=': handleAssign(var,val)
1975+
if op=='/': handle_division(var,val)
1976+
elif op=='*': handle_multiply(var,val)
1977+
elif op=='+': handle_add(var,val)
1978+
elif op=='-': handle_sub(var,val)
1979+
elif op=='=': handle_assign(var,val)
19801980
else: assert False # no such op
19811981

19821982
if var=='T':
19831983
self.write_midi_tempo(int(val.split('x')[0]))
19841984
self.row += 1
19851985
return LoopResult.CONTINUE
1986-

0 commit comments

Comments
 (0)