spiffyscore

Diff
Login

Differences From Artifact [e9eede661e]:

To Artifact [8755d61a44]:


40
41
42
43
44
45
46
47

48
49
50
51
52
53
54
55

56
57
58
59
60
61
62
40
41
42
43
44
45
46

47
48

49
50
51
52
53

54
55
56
57
58
59
60
61







-
+

-





-
+







        "CHORD_TYPE",
        "QUOTE",
        "NODE",
    )

    t_ignore = " |"

    #t_BASENOTE = r"[A-Ga-g]"
    t_BASENOTE = r"[A-Ga-g]"
#    t_BASENOTE = r"I+V?|VI*|i+v?|vi*"
    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"
    t_QUOTE = '"'
    t_NODE = r"([a-zA-Z0-9_-]+)"
    t_NODE = r"\([a-zA-Z0-9_-]+\)"

    def t_NOTE_LENGTH(t):
        r"/?\d+"
        multiplier = float(t.value.strip("/"))
        if t.value.startswith("/"):
            multiplier = 1/multiplier
        t.value = multiplier
151
152
153
154
155
156
157
158
159


160
161

162
163
164

165
166
167
168
169
170
150
151
152
153
154
155
156


157
158
159

160
161
162
163
164
165
166
167
168
169
170







-
-
+
+

-
+



+






        ''' rest : REST
                | REST NOTE_LENGTH
        '''
        p[0] = Rest()
        if len(p) > 2:
            p[0].duration = p[2]

    def node(p):
        '''node: NODE
    def p_node(p):
        '''node : NODE
        '''
        p[0] = tree.Tree(node.strip("(").strip(")"))
        p[0] = tree.Tree(p[1].strip("(").strip(")"))


    def p_error(p):
        print p
        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)