spiffyscore

Check-in [32e6229eaa]
Login

Check-in [32e6229eaa]

Overview
Comment:Now parses roman numerals I-VII instead of notes
Timelines: family | ancestors | descendants | both | ply
Files: files | file ages | folders
SHA1: 32e6229eaa84d0cf52cd175a62ff672dab1295ff
User & Date: spiffytech@gmail.com on 2010-11-16 15:57:26
Other Links: branch diff | manifest | tags
Context
2010-11-16
16:13
Improved lexing of roman numerals, including support for minor chord recognition check-in: 6dcdb96a02 user: spiffytech@gmail.com tags: ply
15:57
Now parses roman numerals I-VII instead of notes check-in: 32e6229eaa user: spiffytech@gmail.com tags: ply
08:37
Added default accidental value of None to Notes check-in: c2f128e728 user: spiffytech@gmail.com tags: ply
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Modified parse.py from [09e3498be3] to [911b321ada].

︙︙
8
9
10
11
12
13
14


15

16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37

38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89

    "BASENOTE",
    "ACCIDENTAL",
    "REST",
    "OCTAVE",
    "CHORD_TYPE",
)



t_BASENOTE = r"[A-Ga-g]"

t_ACCIDENTAL = r"\^{1,2}|_{1,2}|="
t_REST = r"z"
t_OCTAVE = r"'+|,+"
t_CHORD_TYPE = r"m|7|m7|0|o|\+|mb5|sus|sus4|maj7|mmaj7|7sus4|dim|dim7|7b5|m7b5|6|b6|m6|mb6|46|maj9|9|add9|7b9|m9"

def t_NOTE_LENGTH(t):
    r"/?\d+"
    multiplier = float(t.value.strip("/"))
    if t.value.startswith("/"):
        multiplier = 1/multiplier
    t.value = multiplier
    return t

def t_error(t):
    raise TypeError("Unknown text '%s'" % (t.value,))

t_ignore = " |"

lex.lex()

#lex.input("GFG B'AB,, | g/2fg gab | GFG BAB | d2A AFD")
s = "GFG B'AB,, | g/2fg gab | GFG BAB | d2A AFD"

#s = "GF_G,/2"
lex.input(s)
for tok in iter(lex.token, None):
    print repr(tok.type), repr(tok.value)


# Parse (yacc)

class Note(object):
    def __init__(self, value, duration=.25, octave=8):
        self.value = value
        self.duration = duration
        self.octave = octave
        self.accidental = None
    def __repr__(self):
        return "Note %s %s %s" % (self.value, self.duration, self.octave)

#def p_element(p):
#    "element : note_element"
#    p[0] = p[1]
#
#def p_note_element(p):
#    '''note_element : note_element note_stem
#                     | note_stem
#    '''
#    p[0] = p[1]
#
#def p_note_stem(p):
#    '''note_stem : note'''
#    p[0] = p[1]
#
#def p_note(p):
#    '''note : note_or_rest
#            | note_or_rest NOTE_LENGTH
#    '''
#    p[0] = p[1]
#
#def p_note_or_rest(p):
#    '''note_or_rest : pitch
#                    | REST
#    '''
#    p[0] = p[1]
#
#def p_pitch(p):

def p_pitch_list(p):
    '''score : score note
    '''
    p[0] = p[1] + [p[2]]

def p_score(p):
    '''score : note








>
>
|
>
















<
<



|
>

















<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<
<








8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34


35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56




























57
58
59
60
61
62
63

    "BASENOTE",
    "ACCIDENTAL",
    "REST",
    "OCTAVE",
    "CHORD_TYPE",
)

t_ignore = " |"

#t_BASENOTE = r"[A-Ga-g]"
t_BASENOTE = r"I?V?I*[^ ]"
t_ACCIDENTAL = r"\^{1,2}|_{1,2}|="
t_REST = r"z"
t_OCTAVE = r"'+|,+"
t_CHORD_TYPE = r"m|7|m7|0|o|\+|mb5|sus|sus4|maj7|mmaj7|7sus4|dim|dim7|7b5|m7b5|6|b6|m6|mb6|46|maj9|9|add9|7b9|m9"

def t_NOTE_LENGTH(t):
    r"/?\d+"
    multiplier = float(t.value.strip("/"))
    if t.value.startswith("/"):
        multiplier = 1/multiplier
    t.value = multiplier
    return t

def t_error(t):
    raise TypeError("Unknown text '%s'" % (t.value,))



lex.lex()

#lex.input("GFG B'AB,, | g/2fg gab | GFG BAB | d2A AFD")
#s = "GFG B'AB,, | g/2fg gab | GFG BAB | d2A AFD"
s = "I IV V VI I"
#s = "GF_G,/2"
lex.input(s)
for tok in iter(lex.token, None):
    print repr(tok.type), repr(tok.value)


# Parse (yacc)

class Note(object):
    def __init__(self, value, duration=.25, octave=8):
        self.value = value
        self.duration = duration
        self.octave = octave
        self.accidental = None
    def __repr__(self):
        return "Note %s %s %s" % (self.value, self.duration, self.octave)





























def p_pitch_list(p):
    '''score : score note
    '''
    p[0] = p[1] + [p[2]]

def p_score(p):
    '''score : note
︙︙