@@ -9,16 +9,17 @@ self.accidental = None def __repr__(self): return "Note %s %s %s" % (self.value, self.duration, self.octave) class Chord(): - def __init__(self, value, duration=.5, chord_type="major"): + def __init__(self, value, duration=.5, chord_type="major", octave=5): self.value = value self.duration = duration self.chord_type = chord_type + self.octave = octave def __repr__(self): - return "Chord %s %s %s" % (self.value, self.duration, self.chord_type) + return "Chord %s %s %s" % (self.value, self.duration, self.chord_type, self.octave) class Rest(): def __init__(self, duration=.25): self.duration = duration @@ -113,11 +114,11 @@ '''chord : QUOTE pitch QUOTE | QUOTE pitch CHORD_TYPE QUOTE ''' pitch = p[2].value pitch = pitch.upper() - p[0] = Chord(value=pitch) + p[0] = Chord(value=pitch, octave=default_octave) if len(p) > 3: p[0].chord_type = p[3] def p_accidental(p): @@ -146,11 +147,11 @@ p[0] = Rest() if len(p) > 2: p[0].duration = p[2] def p_error(p): - print "Syntax error at '%s' of element type %s" % (p.value, p.type) + raise Exception("Syntax error at '%s' of element type %s" % (p.value, p.type)) yacc.yacc() #print yacc.parse("GFG B'AB,, | g/2fg gab | GFG BAB | d2A AFD") return yacc.parse(score)