From 3add48c938499fb84fe75c9fae76229fdb961dd9 Mon Sep 17 00:00:00 2001
From: Miika Alonen <amiika@gmail.com>
Date: Wed, 1 Feb 2023 21:15:09 +0200
Subject: [PATCH] Added more rules and tests

---
 .gitignore                                    |   8 +++-
 main.py                                       |  11 ++---
 tests/__pycache__/__init__.cpython-311.pyc    | Bin 153 -> 0 bytes
 .../test_parser.cpython-311-pytest-7.2.1.pyc  | Bin 1998 -> 0 bytes
 tests/test_parser.py                          |  27 +++++++++---
 .../__pycache__/ZiffersData.cpython-311.pyc   | Bin 4933 -> 0 bytes
 .../ZiffersTransformer.cpython-311.pyc        | Bin 8279 -> 0 bytes
 ziffers/__pycache__/__init__.cpython-310.pyc  | Bin 162 -> 0 bytes
 ziffers/__pycache__/__init__.cpython-311.pyc  | Bin 301 -> 0 bytes
 ziffers/__pycache__/classes.cpython-311.pyc   | Bin 4944 -> 0 bytes
 ziffers/__pycache__/common.cpython-311.pyc    | Bin 592 -> 0 bytes
 ziffers/__pycache__/defaults.cpython-311.pyc  | Bin 1264 -> 0 bytes
 ziffers/__pycache__/ebnf.cpython-310.pyc      | Bin 856 -> 0 bytes
 ziffers/__pycache__/example.cpython-310.pyc   | Bin 1361 -> 0 bytes
 ziffers/__pycache__/mapper.cpython-311.pyc    | Bin 8229 -> 0 bytes
 ziffers/__pycache__/parser.cpython-310.pyc    | Bin 2070 -> 0 bytes
 ziffers/__pycache__/parser.cpython-311.pyc    | Bin 1016 -> 0 bytes
 .../__pycache__/transformer.cpython-311.pyc   | Bin 8285 -> 0 bytes
 ziffers/classes.py                            |  13 ++++--
 ziffers/mapper.py                             |  41 +++++++++++++-----
 ziffers/parser.py                             |  11 +----
 ziffers/ziffers.lark                          |  22 ++++++----
 22 files changed, 86 insertions(+), 47 deletions(-)
 delete mode 100644 tests/__pycache__/__init__.cpython-311.pyc
 delete mode 100644 tests/__pycache__/test_parser.cpython-311-pytest-7.2.1.pyc
 delete mode 100644 ziffers/__pycache__/ZiffersData.cpython-311.pyc
 delete mode 100644 ziffers/__pycache__/ZiffersTransformer.cpython-311.pyc
 delete mode 100644 ziffers/__pycache__/__init__.cpython-310.pyc
 delete mode 100644 ziffers/__pycache__/__init__.cpython-311.pyc
 delete mode 100644 ziffers/__pycache__/classes.cpython-311.pyc
 delete mode 100644 ziffers/__pycache__/common.cpython-311.pyc
 delete mode 100644 ziffers/__pycache__/defaults.cpython-311.pyc
 delete mode 100644 ziffers/__pycache__/ebnf.cpython-310.pyc
 delete mode 100644 ziffers/__pycache__/example.cpython-310.pyc
 delete mode 100644 ziffers/__pycache__/mapper.cpython-311.pyc
 delete mode 100644 ziffers/__pycache__/parser.cpython-310.pyc
 delete mode 100644 ziffers/__pycache__/parser.cpython-311.pyc
 delete mode 100644 ziffers/__pycache__/transformer.cpython-311.pyc

diff --git a/.gitignore b/.gitignore
index b1cb160..1188230 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,11 @@
 # Byte-compiled / optimized / DLL files
-__pycache__/
+**/__pycache__/
 *.py[cod]
 *$py.class
 
+# Pytest
+.pytest_cache
+
 # C extensions
 *.so
 
@@ -159,3 +162,6 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 #.idea/
 
+# Debugging file
+debug.py
+
diff --git a/main.py b/main.py
index 5f305fa..fa9eba9 100644
--- a/main.py
+++ b/main.py
@@ -7,7 +7,7 @@ if __name__ == "__main__":
             'Chords': "0 024 2 246",
             'Note lengths': "w 0 h 1 q 2 e 3 s 4",
             'Subdivision': "[1 2 [3 4]]",
-            'Decimal durations': "0.25 0 1 [0.333]2 3",
+            'Decimal durations': "0.25 0 1 <0.333>2 3",
             'Octaves': "^ 0 ^ 1 _ 2 _ 3",
             'Escaped octave': "<2> 1 <1>1<-2>3",
             'Roman chords': "i ii iii+4 iv+5 v+8 vi+10 vii+20",
@@ -32,8 +32,9 @@ if __name__ == "__main__":
             'Functions': "(0 1 2 3){x%3==0?x-2:x+2}",
             'Polynomials': "(-10..10){(x**3)*(x+1)%12}",
     }
-    for expression in expressions:
-        try: 
-            parse_expression(expression)
+    for ex in expressions:
+        try:
+            print(f"Parsed: "+parse_expression(expressions[ex]).text)
         except Exception as e:
-            print(f"[red]Failed on {expression}[/red]: {str(e)[0:40]}...")
+            print(f"[red]Failed on {ex}[/red]")
+            #print(f"[red]Failed on {ex}[/red]: {str(e)[0:40]}...")
diff --git a/tests/__pycache__/__init__.cpython-311.pyc b/tests/__pycache__/__init__.cpython-311.pyc
deleted file mode 100644
index ce987795d8a997c6fe47be0454feb8ddc2071a04..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 153
zcmZ3^%ge<81V^XdOlAbqk3k$5011G=XEq=)ogsxGm_d`#ZzV$!6G#vw^GioRv^ce>
zSU;&WDPO-TGc66s(JiPf$;i*sFG(#fDb|mV&&<m#iI3MSsQkrYlbfGXnv-f*#0u05
WGQOA}NPJ*sWMurn03(W+fnop?s3ULy

diff --git a/tests/__pycache__/test_parser.cpython-311-pytest-7.2.1.pyc b/tests/__pycache__/test_parser.cpython-311-pytest-7.2.1.pyc
deleted file mode 100644
index c36b66eeaa938b6e37cf227f828388d93d60a5bf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1998
zcma)7&2Jk;6rcU{N1UW>nx>^3CT%Lbs5rIP_)tPbBvK+FSxA&aQzfg7cau6=+v}MP
zP8J&l)I&g#fKx$$RB<Sv{u7PFAK*wq3M1vjiJPSesp^ThyWVx|BogECn>W8V@4er=
zeQW<ZJe))@%pd+L2_iy&dz*0ZUFA3f$`fQDgR{^g=dXN4DDfPsh>H^ES$Ipnj||~4
zT8tUo$4C+X@tlha$GA63-8lXtgB0L<{0D@8g4Q7DFI)@O7S}}Yqa~-sCy>MSTnxU+
z|A>C(p8@tf!a3x4QM#i!U~LIa?rBIrJmjy2Fc@d|?oH%)th!?gkxWZG$)G6?`kWj6
z)X4`>oR;{xxLXO<2G>BF!UNRc`Z92X8JtAO2chPGwIwwr`ofS5*%|7cT95AV48Z4+
z;ZsDfIit}Qt;a*%i8O@z^OJs$h|BpNRnCx&*#G2n`D{Le_ay!2A{K+^Aa|@UV(+BX
ze=j5cli)&~TCy`9Rso?t->9NZx!<>c_a(drEy+O8>WQKfa}y7<_+bvKOH1xZI*ZfU
z+p2=InT)Eq*R^F_$6DQ7R&l-2(DGQz=2SeB#kpB`1S~nMVHGc9HLtqy9Il%=Z06me
zI?mx4)kA09u{utNJDgT=UYS+g%OB~4maA*n+_Z^FX}MOti|^laZ|jtr#KE`H_Li#9
z<Y!$4zw1MH6q@#stU{G!iwU}Au^9MoSPoSLCfHkdJdyQ;s-&1?lXBHz7i`F8YQ0=c
z)@|FY8Z0rtSu$-0(h~`)%2MyyTiVJ-*>cKN%4Dln(k;r8fI231G@Y=k8hupTundiu
zHqq9s+KO&zRlQ=eghusM(}UT_oPP}nJ5NZBurY15Mk>1FQLyx??j=-WY^cYG67L;g
z$sWSw;9`t3*^oyoC`~Td1o84T23|NAucoIzf#T8Wm5r6!v|C;UGW0EA{-{=+_UKbz
zYJM?D#@=Eh{-sKKwTrzD!MvX)`W^gOZKDn!ACo&M6x$zmE}_wj+aDZWne3pLbi)@r
z$qp|kZXBg9wlBT?+iM_T?xzX|sX{wdI2yn8bbWt3doZ5exp$Zv`=<DH@%#LK3Lm6!
z+n+CwMz3}dpMYqgfLPy7ezmZ>u(J@lK*Y&|)MWeAd<ml?fhVm0CXtlfdE<-X<KlMl
zNStVk6Z_)Cfv<ob%|Ctcq$xl^M&M~Aa6ixYWUk=MNd)vWK}Z*v2CNYcutt+kz@ynM
z%nAISkequ*+8dslD@c0<33MgS;$hp85je-LX+h6sg0_K%%Mi0c$__MY1bHuykC6+W
zPpsQC#A}4#(J@Fwu7h|LpQ+T04a=M*Q?T{^%IG|Zj=*u;q1P*Cf7)m~njP^92T%I6
IAU7e>f5V;3H2?qr

diff --git a/tests/test_parser.py b/tests/test_parser.py
index 8f454a1..074a076 100644
--- a/tests/test_parser.py
+++ b/tests/test_parser.py
@@ -1,4 +1,5 @@
 from ziffers import *
+import pytest
 
 def test_can_parse():
     expressions = [
@@ -24,10 +25,22 @@ def test_can_parse():
     print(results)
     assert all(results)
 
-#print(ziffers_parser.parse("[1 [2 3]]"))
-#print(ziffers_parser.parse("(1 (1,3) 1..3)"))
-#print(ziffers_parser.parse("_^ q _qe^3 qww_4 _123 <1 2>"))
-#print(ziffers_parser.parse("q _2 _ 3 ^ 343"))
-#print(ziffers_parser.parse("2 qe2 e4").values)
-#print(ziffers_parser.parse("q 2 <3 343>"))
-#print(ziffers_parser.parse("q (2 <3 343 (3 4)>)"))
+@pytest.mark.parametrize(
+    "pattern",
+    [
+        "1 2 3",
+        "q3 e4 s5",
+    ],
+)
+def test_parsing_text(pattern: str):
+    assert parse_expression(pattern).text == pattern
+
+@pytest.mark.parametrize(
+    "pattern,expected",
+    [
+        ("1 2 3", [1,2,3]),
+        ("q2 eq3", [2,3]),
+    ],
+)
+def test_pcs(pattern: str, expected: list):
+    assert parse_expression(pattern).pcs == expected
\ No newline at end of file
diff --git a/ziffers/__pycache__/ZiffersData.cpython-311.pyc b/ziffers/__pycache__/ZiffersData.cpython-311.pyc
deleted file mode 100644
index 95e428b8893defee120eb417289bfe1c1b7cdfc2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4933
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
Yp8^64K@)M03h+U&GGe6y4Lm#l3r?Pm5C8xG

diff --git a/ziffers/__pycache__/ZiffersTransformer.cpython-311.pyc b/ziffers/__pycache__/ZiffersTransformer.cpython-311.pyc
deleted file mode 100644
index fed3bd59b920fc62507bfb7988f2ff55cfc2124c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8279
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

diff --git a/ziffers/__pycache__/__init__.cpython-310.pyc b/ziffers/__pycache__/__init__.cpython-310.pyc
deleted file mode 100644
index f84025ede8d029fa3af714bffde1175d0f9f3bfd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 162
zcmd1j<>g`k0;Snq$znkIF^Gc<n1CDyATH(s5-AKRj5!P;3@J>(44TX@8G%BYjJFuI
z{4^P(*a{Mhic^bLG88cbg~7xxJ^fIiP_ceeX;Qv^Rc2ZmkfU2rS(1^T2jl9;$7kkc
cmc+;F6;$5hu*uC&Da}c>1DRY5vYLkh0AcwgumAu6

diff --git a/ziffers/__pycache__/__init__.cpython-311.pyc b/ziffers/__pycache__/__init__.cpython-311.pyc
deleted file mode 100644
index 542df8fc81b45e4205377aa8e5f0600bf090eca2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 301
zcmZ3^%ge<81PMJilM8|LV-N=hn4pZ$dO*f>h7^Vr#vFza2+atknV>W?lx6|aOu-DA
z%r6;%nlu@2F>3i~vfg4VNGvK&ExN^)n^;f)q}h{m5{rvdi*K<d=jZ0;=iTB+Nli;E
z%_%8f$?zFu?Jqt3P@sll{iM>QeEq7-v@{?`x1h2lBR>zu)sK(Q%*!l^kJl@x{Ka9D
wo1apelWJGQ1Jn+(yx1K`d|+l|WW2#3dI5$|*<u$Mpa@l5`~m|CDguQP0J1$&djJ3c

diff --git a/ziffers/__pycache__/classes.cpython-311.pyc b/ziffers/__pycache__/classes.cpython-311.pyc
deleted file mode 100644
index c937db542cdc1bf939c410a56984439aed55d50a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4944
zcmb_fO>YxN7@qa69e>6oaXx@Rp^$>x5|G*hpopp^v>~XbYKqias#a!q14fP=cGrAF
zRN6=!tTs~VDLwSSi5AfxlT=7`_k`3_Z;8T*Q{QK1z1X`;jA$pjk7s9|cixYgd1vx#
zE|+Fh+CTiI4JnNMjgL-Ac$J-%7-Q>9XS!5lOHx@{ij`v$Go%>%jOnraOqU-K;|aZ@
zJffc`oex%)J*Gm;xFJ81sh3_+0$j!8CWt%Gha2~}N#dsZa1$OkP27x;*wuyskDDcK
zt`9fqaR-T;@54=b+&#n{>cdTY++pI5>>AyS$1D(Yv`-YW9(Rnm<9)a}k2^u!y+(G|
zhz)w&eZ<Z68MhO${luN@!_Dgl7FhA%KUgZon48ioc15dIEXz$)EWN7PnzxGhPiIZ-
z?4!?hX0WoPvvTYTGh{>2r5S3~V>F)ZDxVv6#Z_$Mj$JCo-K474D@%r|x@lEiYUs@x
z>RDC2*{syO9@(-@H?OLddc9#+>}sQKsp@041I;f^oV;Qgrgida^J?SdN_BCOK29v(
zwXZkoozIipZo`^hzH4G*ae&3vUIM4<?^!zMTy!q3((7C_2Rqz1bTv8KG`YF1tT#>a
z)=Xl=6aZV_jW5<372C|BAqU_Z^QaAVV1O!NJ5z(syfeQ_uQM;CAn=BECN67s<(A>f
z4b3h+4p}Kz>(Mrj!bU(Q+QzIi=gh6r>&yuo!Hu@@AoX-F8(pH*r5JHN#+Q!7mrne`
zEu(Ii%wZxI6M<mzR&#{9BIAj5X#x;k>urLbc^?{e&bLN46g-<8sUnPqP_)r!sb@E%
z%L!wET#$te<s^4V@g0i0@h_^jcD>}rmNjAi7>!s=1wA`Jt>y%PuN1g190fhNa3;|P
zKqxGj*yHHnu=7bvc1liZwbTxH-Oi6t6h@rO&gE5loy#Hs7%VyfuQh9#FDrGuu_RnI
z;Y)b#0v-nT!doO`0<c{za9`;X91~W9A8qx!)Dtyr7+n-2(Yx->UvHRt$(5Hit2hvx
z9jql+sZ}XS@z_W0=EKA>0f?CO4ndCx<NGP@g_g0le?!5u$&o6;6$nPV@>&y+{Ipru
zkTuBzvsn*EANH8o!;w2@3LOAA8jgPSngKuB<XP(Jjy?{EuE@v5VPPc71A2_MOv>Lt
z%6(Q&>v6&iKS~nrKv|@FH*u>{YZ_L`M6%Q*f=<D`NTzq^G{HK%#~#vexb)tH?lILL
zLuZtFq!OKgS*=m48Jex)=;E3lORi!WwM7f;Lnbndn^V>0hGnbOdev6dl~K>c>7M5I
zi0S3@c46Yr!qgvysm;Q%r-frJWi8dBKR)q2o+u>4J(;Hp-3X<J^cya?6W(JteEVlv
zuWyg2=ZW8ov|4g|Lk1<t9XnXf>+Bj0_igGs>7I1M*Y;CvExjNzPf_Bbp!me5Pq{Kp
zgoT(N65)7}p25b@8cWOPR*rXK(H+R?nOZ|5p>tH}FsEq%3u)J38{?<N^Kjv3`In^s
z$>T#xl^cy}-7FH<d>>LTXTn5~R|-)&Pk@OP>accx=*QdN-xlNkHv9V}s%?&+eoB}>
z^E7{EBY8%s$_BUn5t8Qzir6%m9#_G=h{r>0Cpg0G2qx*{=m22rS>F&iU4PHAdmfCg
zUD{B_>Dg4q+nFI}w!Np|%(jkfC<S^pmBLm`iXY!%J}6TBEIxxEQV4Wu^!f#}jIsj@
z`tL{Y@|IjMZZ?g&X7G@g9)}L$KvV*W9GlPtoPuWLlil1F{tNpd^gr02S!iC>tGB8a
zWkcbDd4@&~PR|V503V`)GgMfCrf4hrBx0F1n&KwT-_>eW&BO+A;~IS!rEoU>2<j#P
zQ76ecbN~>Ma5f$qb}qC&5Xbw=vk?4fyN^;&aQ3|njElRteR1pg0qn|4)jC1tPRSf6
z(O}^GlNyl<-?CEPjj-LR_*cXKYMmRWTgElRjazobv|ZV#>(Lg@!fL?BkrrmWdv(}C
zE>tS+aWnpZLWX6^7)}8s0Q}a@uf<4T;y%D*au}aTIegdiJ-`<jpGrP-Ae1kXGvdFY
zbLJe0A+K4Zq-{%<B&p4c8&S_QDNSiX8l*fBf^D=t2W-nMmbt%IFcVZqEf1L>v}{P_
zA(iiv%5Qa~a*zr_>nlj*AeHNq%K1`bkP1R;7E)u78tal8^Q2^{u*JgAy0DGb=Kx;{
zw6y2f2y_ME!4!0jK-Y*b1zOURnuJskpo>}|HQ6OK>H9?%N-(nrT1`lig#=wv1y5=~
zqJ$lWZL~cH_%a|3d-hF0Nf5+rO+eFxF9lj>wt@nDkOxO$-!4+Y;6ZAn_4O+vD0IcJ
dD8c|;)cPFYTL_wndsu)Ef|U^|<!j*C`Cqy>kB$HU

diff --git a/ziffers/__pycache__/common.cpython-311.pyc b/ziffers/__pycache__/common.cpython-311.pyc
deleted file mode 100644
index b26c5e59c25ffbb245096dec2eac038f42664781..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 592
zcmZ3^%ge<81UI^GCN}};#~=<2FhLogg@BCd3@Hq$3~5X$j4dotj44dP44TZh*osn1
zN{jN68DUz0G#d~z1M%k_Kw>&W36fk5!!jUmHC&_wW&==VDMOJ{2`i8R1vLyQjFK=8
zx;}Qe1OvL6DNNZcAlV{uG}D+;7+RTdnV83z&QJx^mB&=Wkj@D5o8L>2DK9~8)nvKF
zQc_uvdW$6|v$*6Ids<FnNl9wnE#{omJWa-1%!x%s#UOPGzjX9Ni&Kk=^^;1I^7X4S
z)6#$(-Ga)JjQl(pS3fyFH#a{|ub{Gs1E>c~fHW6}0*MBOyWaj60)kIkp0T_d5p%&C
zgnG><7*8miV%BNjW4~2-L-IzAEgCxlH|cE9nVY^Kd4=K%r4>p`(l5&CU6IqfAg6c0
z=_0rL1t3aJyO5NAfhGMj&|n5XO{OAHsDbTU$xy@tVsitDUmP~M`6;D2sdhztKrYxR
chCs##W=2NF4@``V8H^KLJ}`i2{3O^&0BPcX`Tzg`

diff --git a/ziffers/__pycache__/defaults.cpython-311.pyc b/ziffers/__pycache__/defaults.cpython-311.pyc
deleted file mode 100644
index b40e672ec49f1907e12fb94fcbb4ab66af29a6da..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1264
zcmX|;J4{ny7>3WG6bkgp{eHidOA8drotC?kiy<*C2KahGfzqB<q!YVK6Jm69A!_2_
zV&dT7VsvnDF~P=xXiOX&{)CtqCf~3BfBHA)>GOT(eRFbho;w_s8qUR|Z@Ukyn)Z_i
z^OP#N`T=>O?P;Wuex_3iS-?`Vf@M?=+Nc7oq$<!(4$w(1&`ln&nrgsWssrn(0c@lu
zu$fxGR%!#=sRQh!t}`9a>82h`z0?Qx(*QU~UT}zp!4Vn-edGtnXdIlN060lgV34N4
z8JY#>XdYakMR18iV3?M{6<R&h&vja(^*#LG(P-nA=H1Ne2Qm51o#DKGKekmkb?|+)
zcZahj<WqwUH;z=u3MaMK5IQzP|3Z0vSB3t<k5x#7vX;2dO#KOEOXBA68?h5r`2~-w
z$|WkvV&yw3Nwac+*rBR?g(p?z3o4Of<ufV~v+@bCZB_XIkEqIfRE%Qf9V&)dd5c(7
zRo=i2Re6m{x>$LIO4_WvK<uHaoWs+q@(iJj8G4EvF%^0Y&!|uieoy%+JQ4F0P7<C~
zdriCP)$?|WM7J~h>ARFk885Xf{)*Q=|CSL+8UCHjPQstvi$*bw9-XA)i9>VrtDfOI
zI=Qwj93&{SA6ZJZqORjIK7zuc>$)iEbvrMdo?Jj!V3)8tVTFk@%~g$UIlE1B)#O%1
z1$!m$XGImeU1l8YPMLAByJg11UM({<?6sP!Hn%0}*y}mJCK}iqWxk2MS>{{VTRDGQ
zw6V8yeqD61cXDP%bg_4{Pl_IPjnOMheeC^Q+7JWmgR<mhA7Y;p!|Wq6Kg#ao{0-q}
zACviU_6hc&2(VAe{1khT^P6IteTFmBVwQbQ`aJuB%q+4m$$f}Dtjl3p=V?VvtA%N;
aFa^bWVJf`VMqw2Yo5j_soqwrje9-?iqf3ea

diff --git a/ziffers/__pycache__/ebnf.cpython-310.pyc b/ziffers/__pycache__/ebnf.cpython-310.pyc
deleted file mode 100644
index b18163ad26d5bd9c4487aaadb5818fdafe0023aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 856
zcmYjQL2}bD6m>c*GMVWeJYL03Q#0(CX$l**Y=8|7WNcYZ47MdC8IzXw0NkXzUV<aA
z$(CEN;(dJ?@@FFHKfU+#CI6_?(^-T#JpK^BPNL{HCC4#A@)AEg#ZX4?qjK^lN>B2i
zAkSjNO<h&e*mxDsi`>Lntc2?|&!rkVtZZMD^;ayU6}gsJnBCs(S}dwY<qoshDN|zB
z0>fZmq>Gt%4+@w!E}s8qrSaCKo)OH6QJDN+IR;6}9;~8TSMa}mc7ErDI4T6Ro!oBx
z*;;Ih+}4841MH>qdy^~^IPlg;Bv<TQKV3e5`|3l&M~3@(9c{Ls8(oTFzw5r_va;XY
zw*RDVMm9eJ72~be<zjt-A$T<!&+20pC-cPDZjP~(F@OD$cO7{2BqN67XxWGngx_u8
z9b<Qa=U7QqC6|nCkFhHh=pFfs6C2Er%mn7YzQ;D<D%2nxAbt;^ZhGpT1ox%Aw(dAz
za_;I@`u#J`sgt~E7WA^!Zr{|MgvnqR-bARj<%`4koP~qsqe*<9tZndnolXu<WYJX*
vkwH)M@aHUhXVKMJ(HANUExy!fTGfqdMxqP7KTI!MRrZa%qW_8|kLlzuK2gqU

diff --git a/ziffers/__pycache__/example.cpython-310.pyc b/ziffers/__pycache__/example.cpython-310.pyc
deleted file mode 100644
index 31be1f4b0b4ca249fe4e9f25590bc69b6e5a6ad1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1361
zcmZ8gyK>V&6y06h#0d@<FeG3g%T|(&<Fw4gaSAe_U_z0kaR?dNT00u_LXSA+)zHy0
zLq$u$2T<`RYN^ywG6V>Bccoz1nZ1v5j*fQkNZ$PX9D>z<|8}rcMChw%rdJ7?b=cu|
z2qrSIjU3#=7@4F;EMyiqF^e_y4x1&Y&eaganL1h!NEzx`$<0A^UUCr6_=-Y7InT+|
za~C)P>|%~B3a_fr)<tzmDWSRy)vUy>2yGpSw+VOPYQPm`b=ABE{Q~rhvcC@14O!Kp
zx+yBix9Z~Lx4~oS1Nn%11&&Sn2KS2Qoo%GE6mE}noXl(nhT|B)Nc0GO>n7Mq%TOiw
zX)0!w7Gz_mFiZgbl*nu*c#z<6f+q<+Ot72aX9+eE%o98uZSRWp8N9-@D&@!NqRdfB
zA*U-MtV7UAf=3CCjW1w3M`7_}KcF3|xv|sd0Ud{3y+I|DAssq229Xy~!!)hPI^qq<
z=AC$!HCdarn4T#mpFPx}eqh0UC)A1U$ntG#VEi@t7n4>EM%xtZ^!!2TmYaZ`5pXvI
zjmt+O%3~{yVkp=!jb#jFI+LuB1JPo+?|+xnwAXBJrFCzgH7Q$WU7EKI9bTgWbcQr_
zooX86aLNrhrv|2N7=b<|=*oAFLos2oI>0>+8|o-F+#!eIq*5A8W7(1IeqfyG_A=cx
zwx9V8au6=~BGXM{uQFYv+~kB-6*ij2))Y4I;0u*f@Vl!pZxF?Pjy*ZUOmFN03c3S@
z^^G93Mj7@}VZI%QLef;NW4WqtsXnqCF8ORcrgfw&+luFoA5Cn_<=`<6n{r%RdZ|}~
zk%gAyxt14)%Omw)1?qRX->Ymr+SxdGxUsdl^I$uf$>>igVDKBr@T1k<4S5i@`*GiE
zKevWMXj=XxI`rJUZS!Np@om2BPm=Pg<C(F|*DyGQI}j?UNC+-ta$1Ega!q7Hepg@v
gCv&+#e&xF=>LU4Bge`KpL{7x6l*%V$7Q9aX0HXXz6aWAK

diff --git a/ziffers/__pycache__/mapper.cpython-311.pyc b/ziffers/__pycache__/mapper.cpython-311.pyc
deleted file mode 100644
index 853b10a83d8b90b07009ab7212384b6d11a36f42..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8229
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

diff --git a/ziffers/__pycache__/parser.cpython-310.pyc b/ziffers/__pycache__/parser.cpython-310.pyc
deleted file mode 100644
index 906f8863020697150cb3c94e7ae7eb6d3c55df6c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2070
zcmZ`)OK;mo5Z>iWv>vVyxK7<T?V{-eLLIr6qJYsB3DO|wAx4p;HOe3$DDFyPLvrcm
z%C-b4C}5v@?ky+~AN>P*=wIQrr<`-^q38@LTQcG<vBQ0FX7-zJhO*VF6KLQ3`CIsx
zL&)DaS#B0g?m*9bAUNSPCJFT@#jz0^iRqc;*o>{j_G}ni+>V{Z@f;XCUQJNp98=GI
zKzNP2CxpAgJT|=*z9Q<pE*gD{H+b{J@|wK$m~>WOgB{YLMeTtKk|a<tZ0t%dev0x)
zOPt!7ic<ZWR_83yOZy$8SoNZQU#NV3u4re0%7rhEG9~gnl4*#Fmzx2TJJ9nlKnUVd
zPCSEC&*TO-Pl#vXRp4!Nhu7fkaF?&ZyT<F_XhYTDvq`7Upv{f4zEn&P1)KZA@^Pwz
zqi%U7G~xVt1E@&@`aS6R?;tclJEboH)T!~3{9zp<#O8oRbY@PC@5r;SX4Vuu+92G9
zRnj*Ph`Oa|wWf_@L*3eMPa0E`n;YbnS*@RfmOZlHwurXI4=9;IfF>=l<xFj`VxW~h
z@-yh1*)Qz<cJ)4_hh%EP9cz;prR#7*_C#j4V{ss2c7Tx(s>}AGIA&S}2LQWZLCRTg
z6vdq7G7)+hr2{5Mn#n#3SSXV$7P>lh5X2F`P<)QnB2pDzXmsLW=y%wpxy9}cLAMg=
z4l8PtD%J`)usgZ=R0;m<zEXgGl(PBe&eLsNW*u80iHkb8o#r}7Ls3{f3U%QGSte3m
ztlU2eMW%rx9jCBz5%&u#1-peC&TSSBkZ2U^f<^@uXGE=m#(%c9f6U?P+r3dwZqKdW
z&c=Eu)AQ+e$wJl5#zm{d&7YrZgM$2h5NozeU4u~ro^`qkPm{X88vk16WYfDu>Fy;3
zm*|AlLOLUz-ZVi>=`Yx6L?4qgx_f4LD~PY31_|6=iz9tzs#Q3s-a&!hly|DcyD%->
z%3KzH1hY4&y-6q6uXHI3|JNIJ9aX=FVgtnu6o}rErDkPG<YADBPjK%hh{=sBZB?h<
zvWHA4lgWj_)X2;!+`L1BP1v}g+LK|FGvuZOk_wS9Em=>L89NZEP*Hfk3mZ`y#v?9}
zQ9(LpOEqZ0&mWZR1-*C-S~R2t>U%Ck#v;vvoPn|Pf{;K;q`J#W4`97w9;QgZ4u>)p
z7e2<aOqoHTdcgpElcjt8C=Ft^ND(j?1|!J2?-`frXPPMy#NfyCR35S+bS*D59x6yz
zbSYCZ6Dl5eyNerCVYn(PtvMuq8J#VFHAfP-wYPYA>ELe1EnL4On(r5N-%lhT#RA4n
z-`^hvF;Wm_HQ(nl^nJAsO4TNc4^VuFVnL8{gnTT^E&i)=<hM&K!?oONuGy@WJ4Jl~
z4rZ$!sWe1VoHtAn>?KJs@iciwr{t8*C{#}}gSrb<lb!-?O1gF|_ys+>`|#o2N1k0}
zF&2E!F5&2y>SLT)S_$FR$~CE${4QNaE`A9;$8uk%4y{v#YrCD6w}v{SM5d7(<=sK`
zvr~w$ckR*^R-#;?>xBgj9hTKhp+>|Iq7E2-3bP6ZGuKMtpQSXk<j@6>h5L0Cl5Y{7
S98<pusf`a{YP5~@&;JAEIR!=l

diff --git a/ziffers/__pycache__/parser.cpython-311.pyc b/ziffers/__pycache__/parser.cpython-311.pyc
deleted file mode 100644
index c59c69ae91df09c4fe4c3ed02c969438d8120c1a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1016
zcmY*X&rj2E6n|a6>$Y}37$9*RU@@YZAd8xS2jk7egCQp1rGzwve&+^lSHCSrrXf3c
zz{CRw6F7204gLZC3Eu3;66QBCA@L#?vxJ)`U$++7%X{zpe)scz-+s(wWIz&kf2{q9
z0sIP_h?1dk{u_-wFu)K@umn{Qz=#>58Cwcs#1t)}5{!WnH{+J1N&>`y5}G&^0FF@l
zv>wd^HAPc~)KCCa87rlAwE9G4nlKVZ5~Jxu3>`%Y_>ww|qmR-jHDkzcLCw;fp==;>
z09M2<fo2Yd!jgf*NDrbJ^bmb!u_vYMS<qJ!c-&z%+dB*JqbJ-#MV{(jH8`K>Y@?BG
z)G8Iq+*uPn9)GEuo0Jn%H(7~riBVJY>OAgxI`g>X=**>zD<0Erw^C;oWos9!!B2>x
zoX?@L2OjE(4ldV4L3jg$S6D=p3#Ay(hN!ggi}BtWfTph;<_5Ehe`m_i5RF@2-CV7g
z!-m_=mRGIYkz4Nf&pKOtsAp<HKXu(&-DV>=C3rM<3{?|;Duoke@>rQXAT4F8txWl3
z>Krq`lbUAfHCxjfspUJx<-5guD=Q17JSVKSR%OAZxn${%gR4n6xLmWg%A_EQdt@6d
z5zeU8OsZ+UEmGU#>E}$hES=#Uy(&+H9w&8&+I(2;Kg-hpO|u-%>46Ra*}8?pSn!*C
z1~wX`hEe@ZKCtS>rb!>NYv=}xa=)YMih>|?V9X!n4qWjg?!Z-lkS}NZWv9839dGyX
zyY2Ve?cDWdx+9P6PqgHl&BSSbe0TIiVSoP9{jc-i=6vl1a!YgDn(ODiR^Dspy=Jyc
z1mQ*(E|df$z0)`r3%*$BkW};0&g_XiaV$^lzi!FXZF#yyX4+)NkGLxW8OPe*h5rHb
C?E|L(

diff --git a/ziffers/__pycache__/transformer.cpython-311.pyc b/ziffers/__pycache__/transformer.cpython-311.pyc
deleted file mode 100644
index dc3dc3f64432b31af5f58305bd38fbdb55d02d74..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8285
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
C?f#np

diff --git a/ziffers/classes.py b/ziffers/classes.py
index 7d82b78..8c8175d 100644
--- a/ziffers/classes.py
+++ b/ziffers/classes.py
@@ -5,11 +5,15 @@ class Meta:
     text: str
 
 @dataclass
-class Duration(Meta):
+class DurationChange(Meta):
     dur: float
 
 @dataclass
-class Octave(Meta):
+class OctaveChange(Meta):
+    oct: int
+
+@dataclass
+class OctaveMod(Meta):
     oct: int
 
 @dataclass
@@ -25,7 +29,6 @@ class Pitch(Event):
 @dataclass
 class RandomPitch(Event):
     pc: int = None
-    
 
 @dataclass
 class Chord(Event):
@@ -42,8 +45,10 @@ class Ziffers:
     text: str = None
     def __post_init__(self):
         self.text = self.collect_text()
-    def collect_text(self):
+    def collect_text(self) -> str:
         return "".join([val.text for val in self.values])
+    def pcs(self) -> list[int]:
+        return [val.pc for val in self.values if type(val) is Pitch]
 
 @dataclass
 class Sequence(Meta):
diff --git a/ziffers/mapper.py b/ziffers/mapper.py
index 78b3e05..1721342 100644
--- a/ziffers/mapper.py
+++ b/ziffers/mapper.py
@@ -2,7 +2,6 @@ from lark import Transformer
 from .classes import *
 from .common import flatten
 from .defaults import default_durs
-from collections import Counter
 
 class ZiffersTransformer(Transformer):
     
@@ -28,11 +27,14 @@ class ZiffersTransformer(Transformer):
 
     def pc(self, s):
         if(len(s)>1):
-            counter = Counter()
-            for d in s:
-                counter.update(d)
-            result = dict(counter)
-            result["text"] = result["text"][::-1]
+            # Collect&sum prefixes from any order: _qee^s4 etc.
+            result = s[0]
+            for hash in s[1:]:
+                for key in hash.keys():
+                    if key in result:
+                        result[key] = result[key] + hash[key]
+                    else:
+                        result[key] = hash[key]            
             return Pitch(**result)
         else:
             val = s[0]
@@ -46,7 +48,15 @@ class ZiffersTransformer(Transformer):
 
     def oct_change(self,s):
         octave = s[0]
-        return [Octave(oct=octave["oct"],text=octave["text"]),s[1]]
+        return [OctaveChange(oct=octave["oct"],text=octave["text"]),s[1]]
+
+    def oct_mod(self,s):
+        octave = s[0]
+        return [OctaveMod(oct=octave["oct"],text=octave["text"]),s[1]]
+
+    def escaped_octave(self,s):
+        value = s[0][1:-1]
+        return {"oct": int(value), "text":s[0].value}
 
     def octave(self,s):
         value = sum([1 if char=='^' else -1 for char in s[0].value])
@@ -57,14 +67,19 @@ class ZiffersTransformer(Transformer):
 
     def dur_change(self,s):
         duration = s[0]
-        return [Duration(dur=duration["dur"], text=duration["text"]),s[1]]
+        return [DurationChange(dur=duration["dur"], text=duration["text"]),s[1]]
 
-    def duration(self,s):
+    def escaped_decimal(self,s):
+        val = s[0]
+        val["text"] = "<"+val["text"]+">"
+        return val
+
+    def duration_chars(self,s):
         durations = [val[1] for val in s]
         characters = "".join([val[0] for val in s])
-        return {"dur": sum(durations), "text":characters[::-1]}
+        return {"dur": sum(durations), "text":characters}
 
-    def dur(self,s):
+    def dotted_dur(self,s):
         key = s[0]
         val = default_durs[key]
         dots = len(s)-1
@@ -72,6 +87,10 @@ class ZiffersTransformer(Transformer):
             val = val * (2.0-(1.0/(2*dots)))
         return [key+"."*dots,val]
 
+    def decimal(self,s):
+        val = s[0]
+        return {"dur": float(val),"text": val.value}
+
     def dot(self,s):
         return "."
 
diff --git a/ziffers/parser.py b/ziffers/parser.py
index b131aaa..4862b59 100644
--- a/ziffers/parser.py
+++ b/ziffers/parser.py
@@ -9,13 +9,4 @@ grammar = grammar_path / "ziffers.lark"
 ziffers_parser = Lark.open(grammar, rel_to=__file__, start='value', parser='lalr', transformer=ZiffersTransformer())
 
 def parse_expression(expr):
-    return ziffers_parser.parse(expr)
-
-if __name__ == '__main__':
-    print(ziffers_parser.parse("[1 [2 3]]"))
-    #print(ziffers_parser.parse("(1 (1,3) 1..3)"))
-    #print(ziffers_parser.parse("_^ q _qe^3 qww_4 _123 <1 2>"))
-    #print(ziffers_parser.parse("q _2 _ 3 ^ 343"))
-    #print(ziffers_parser.parse("2 qe2 e4").values)
-    #print(ziffers_parser.parse("q 2 <3 343>"))
-    #print(ziffers_parser.parse("q (2 <3 343 (3 4)>)"))
+    return ziffers_parser.parse(expr)
\ No newline at end of file
diff --git a/ziffers/ziffers.lark b/ziffers/ziffers.lark
index 6fcd6d5..1b6c7bd 100644
--- a/ziffers/ziffers.lark
+++ b/ziffers/ziffers.lark
@@ -1,19 +1,23 @@
     
     ?value: root      
-    root: (pc | dur_change | oct_change | WS | chord | cycle | randompitch | range | list | subdivision)*
+    root: (pc | dur_change | oct_mod | oct_change | WS | chord | cycle | randompitch | range | list | subdivision)*
     list: "(" root ")"
-    randompitch: /[\(][-?0-9][,][-?0-9][\)]/
-    range: /[-?0-9]\.\.[-?0-9]/
+    randompitch: /\(-?[0-9],-?[0-9]\)/
+    range: /-?[0-9]\.\.-?[0-9]/
     cycle: "<" root ">"
     pc: prefix* pitch
-    pitch: /[-?0-9TE]/
-    prefix: octave | duration
-    oct_change: octave WS
+    pitch: /-?[0-9TE]/
+    prefix: (octave | duration_chars | escaped_decimal | escaped_octave)
+    oct_change: escaped_octave WS
+    escaped_octave: /<-?[0-9]>/
+    oct_mod: octave WS
     octave: /[_^]+/
     chord: pc pc+
-    dur_change: duration WS
-    duration: dur+
-    dur: dchar dot*
+    escaped_decimal: "<" decimal ">"
+    dur_change: (duration_chars | decimal) WS
+    duration_chars: dotted_dur+
+    dotted_dur: dchar dot*
+    decimal: /-?[0-9]+\.[0-9]+/
     dchar: /[mklpdcwyhnqaefsxtgujzo]/
     dot: "."
     subitems: (pc | WS | chord | cycle | subdivision)*