From c85d4de431e932690dd42cb7404f70c92ae5dfac Mon Sep 17 00:00:00 2001
From: Raphael Forment <raphael.forment@gmail.com>
Date: Tue, 31 Jan 2023 23:03:35 +0100
Subject: [PATCH] Correcting some imports. By doing so, I have also broken the
 __main__.py that was living in parser.py but repl.py is now usable :) The old
 tests should probably be moved in the tests folder.

---
 ziffers/__pycache__/__init__.cpython-311.pyc | Bin 311 -> 301 bytes
 ziffers/__pycache__/classes.cpython-311.pyc  | Bin 4954 -> 4944 bytes
 ziffers/__pycache__/common.cpython-311.pyc   | Bin 603 -> 592 bytes
 ziffers/__pycache__/defaults.cpython-311.pyc | Bin 1274 -> 1264 bytes
 ziffers/__pycache__/mapper.cpython-311.pyc   | Bin 8266 -> 8229 bytes
 ziffers/__pycache__/parser.cpython-311.pyc   | Bin 1025 -> 1016 bytes
 ziffers/mapper.py                            |  10 +++++-----
 ziffers/parser.py                            |   2 +-
 8 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/ziffers/__pycache__/__init__.cpython-311.pyc b/ziffers/__pycache__/__init__.cpython-311.pyc
index 1de4bd2664f91eedaa13e9489207ad5ab560a2eb..542df8fc81b45e4205377aa8e5f0600bf090eca2 100644
GIT binary patch
delta 61
zcmdnaw3dl?IWI340}v$i+)OT<$lI%;ryp9JT2!o`RGO5pUzM4b2IS}#RF-7q=fSx8
I6Hnv=08;N2g#Z8m

delta 71
zcmZ3>w4I4}IWI340}#A!xtUxxk+)aRBH1b?v^ce>I3_nUGdoc)F(*GSH7}+rGc64$
Rs9R83l93PR#!TFo4*+Qg8lwOJ

diff --git a/ziffers/__pycache__/classes.cpython-311.pyc b/ziffers/__pycache__/classes.cpython-311.pyc
index cda06edfc2a17c995b7f9136deafa43bf491bf6a..c937db542cdc1bf939c410a56984439aed55d50a 100644
GIT binary patch
delta 64
zcmcbmc0rAIIWI340}$NkzL_kzk=Ke@MOQzxIJKx)KdCe+U%x6dEe*)gEvPKX$j^gu
L^*5I?KjjAiq=gnx

delta 74
zcmcbhc1w+SIWI340}ymK+)NJH$ZN%{XP#^o6Iz^FR2-9=nVFramza~Emzoz-m6?_X
U6x1!KEXl}+b7MAVGe6}A0Hcc<(EtDd

diff --git a/ziffers/__pycache__/common.cpython-311.pyc b/ziffers/__pycache__/common.cpython-311.pyc
index 8232b4efe2bc94f23fdc14e6054ac9c34ea5eb6f..b26c5e59c25ffbb245096dec2eac038f42664781 100644
GIT binary patch
delta 100
zcmcc3a)E_+IWI340}$NkzM0&#k=Kb)MMpohIJKx)KdCe+U%x6dEe*)gEvPKX$j^gu
t^(WUdN=SwRwKXu@_4dCI5PZ_|jOEpcm<!$@G<hAP1k(nc$tM{n0RXS@Bnkik

delta 154
zcmcb>a+`&BIWI340}w1#x{=(xk=Kc_-YnTFCbT%Us5mA!Gc!9;FEJ-SFEuZwDl;t&
zD5zUdS(1?t=f))G=jP_;=@nEKaR5yL6O2GcaTt(jV7Tk;e<2|Fq~#gQs}V65ykjnK
rr}vsqFrH92#jMl5$9}8whUASJTQqhAZqm6R=QcNeLGp^phZ%bT*cdnc

diff --git a/ziffers/__pycache__/defaults.cpython-311.pyc b/ziffers/__pycache__/defaults.cpython-311.pyc
index c237efa5e17b4122f2fd3c7db4d13f2fca4a19ff..b40e672ec49f1907e12fb94fcbb4ab66af29a6da 100644
GIT binary patch
delta 64
zcmeyx`GJ#nIWI340}$NkzL{LMk@o_Vik^OGacWVqeo|>tzJ66^S{jg}TToe&k)H?S
L>Tl*|e$NO1(C8N9

delta 74
zcmeys`HPcxIWI340}xD7xsg13Bku(!J&R<kn9$<XqT-m`%*^aWy~LdSywtpys?4-B
UprCF+Wl2UpoEx*5k@-C%0KY04@Bjb+

diff --git a/ziffers/__pycache__/mapper.cpython-311.pyc b/ziffers/__pycache__/mapper.cpython-311.pyc
index a675381f4151051960093e360e69fc99857b5407..853b10a83d8b90b07009ab7212384b6d11a36f42 100644
GIT binary patch
delta 910
zcmY+C&rcIU6vt=w7yZE^KT4tUtNakMNa+DnIrxJ>f&oRWTVm)zDBYrs{eiQsMilj6
z3=$7D69eHSF+v4R&^_}9Xrk%K)FvK15M%Vh!GnqOww9!mx1V|M``)~rnca^=uZH9;
zS+*fIY?-fN?wRa*5M;qB(vXH@D2{^|BaPGe7#Dz9i1BeDD43cU6XQ})Vm{KOSVi0t
zv|z-cb4aUrgfvS8Z}JH3u%|eJR?Vs+#kLQjf(!Nl2_^LTB#B4JJ}zpwS9!Os;;ugL
zlpZ0vcP>4b^e#r{=UL!cxRbh`Oq4>eahx0GIU*QIk>DNy8t?^CPlZUTz(*1qae>5<
zUN#lP%b~=z2<bB{6+dxLCzBqcoa0Q<*3`G!?!fElo9LcnJDE*p)GT8*X}GN~IXiSV
zdy#JX+3v$0Dpp>oUol&JvsW$OeByiR%e1cyE)UXZ<pCb0Gjc1dx-YNeaq6o2(thc%
zgSkswkS4>a(5;BVlPXAgjOrs}STbMKO=qfu;V!d#&M{K7U16>31;4JWDH(sppRGMi
zkXl&J0sIUKSK#$@oQ#2AY7R*dbodf(x0_Uhq8cqVJD6?oL+u~?EGTeYM4+GQ8nDOs
zUKhn!Fed9y;MQ(Pgc#Umc7Q((zVLtVbi=7gVWuoL(G9+io^o1@AI=)Kn*MD#CZB~`
zu~h4A?38Aq)(N#%EloyPq+g+_#(r+uN4FYPdyFZh0WeNQ*FDDsa}`{ECi>j<UOH*k
z7!yY~IChR-%}f4%PzC^}0i%HPfQx_tKm}X{XaLwanFTBWbU+$#7qDdPwcN&5TS170
v$PL2N;kN0(W0ry6RbOTJ&0~!7s5w_|dF0HMERULU<(5YsxpJciZBzdMQ&-#m

delta 931
zcmZuv-Afcv6u);qR@ZHot=4sRGh08mLEIj+MIyvLKuk$=6>3<k$r*ESXE*PzMrP$h
zP)UMu9}*!jq@ph{=dt<+dZ>9RwuN2;i9muL?5TT3T@bpQ`@84<&bhyP?wNVo`LR=a
zE=d)Ljl;9wMus0s;oBG3<`L47j?>7(Dz-S4!?5Sl{2;7+TChY_bU7jIvC7mk*B8^}
zmRI#+#Gx*vd+s2;%;28!2)$x+Yp4}^c@in!b=WFgQRvmkc+odVv`lU^ODuyZZ<o*E
zcw*#OYA9!rT*@-daV@T;vl%0knl?vA8QF66dVVZh+NSJk?j+BxWBZawaI6WW`J$N1
zYb0Ofjf_sh?ro%*Ek$ua%Um%?i@oXjg_~oHnng~qW6KtkZ}ipH7v^j8L-1vmaSO>(
z%$B?>oDbApJrbkud<h(<zkR*(yesqF=f5{`Kk*>3P&?PYfxO-*P44-FyJ)vm!xG1&
zCEP=K|JU07l89R@E_(V#^4gT4@Wc<Hxc%4PjXmyNG1?taBaQ9_PVm&0tqO|`%lwk!
zR5sK1fymJT7G~|_bCVW11OAQ>r~#3KPY{hpNdTBZ2Ge0W5eVB2d*?B$YHi<Uy#^s@
z71^$;{PZNz@@6(ulCwYUH!*Iq+bi2}4fKv&W}tAS4ty1SVfzVmE~I#L#!MfeC*+X*
zITT_i>5r;LsT1<Vojh5t#~M8@N3lwW<+!+ku(yTI%SoTb@<<gx5B(|61kb`by!(Ol
zMtIHB?&jF7ktZB`%a`h#{YQXl1Ly$g0_X+k0~i8;CXkB&1^|>w+!joLmj{>vm;tzD
zuN=IF{l21*W`8V!ZW4jkA3CqzWiDnj_n5&3k1;NwI_G~@K$Xsp6;Q<4Z3R^8>^ABg
G8u|w}G32BG

diff --git a/ziffers/__pycache__/parser.cpython-311.pyc b/ziffers/__pycache__/parser.cpython-311.pyc
index cb14bd1b471dc4053942afef6b65415644e1bb15..c59c69ae91df09c4fe4c3ed02c969438d8120c1a 100644
GIT binary patch
delta 329
zcmZqV_`%M%oR^o20SK5U+)RGQG?7nRoGFDlhbe?1g&~C{hdGxeiiHuxW}O(I&B!*f
zM$(Wyg@cJ9m1h}H(`t}TFj&L6j1|ZSVhD)hP2p-`h~i7-PvM?;OqG#m;v0Dx-e86l
zAlBr22~woVc#E~5C^N6*B_ohGS&8wYijID0acWVqeo|>tzJ66^S{jg}TToe&k)H?S
z>Q7c=l3^5{Y{wMC!v@rMizO$qD7%P#@-im(cz&QjkuXS<BR)PaF*h|nzDNMbUCB@+
z0+JE}62CZXa`RJ4b5iY!lz?22-NomD#0O?ZM#dWqVi!=+4F=H*Ff`eRxt93?v*hG+
O%xc^WEK)!w*jxZbm`_&#

delta 315
zcmeyt-pIkXoR^o20SI2V+)QR-p2(*y&XB^C!xX}h!jQt8!<@?!#li?;vrG)oW@MdM
zBWcK%!p_8y%CiipX*EbE7_8w~#tP&EF$6^Mrf{|}MDeBar*KU?rpm}Y@r}GVPcTCY
z5Nq<j1S!&Fyv15jl$lpDS)K8so>{V0OlWaxQE^OeW@dJxUSdvuUTR)URc2ZmP*As^
zvLquP&W)KY!z9BfG})3Vh6iNjEtZ_bqU<8J$qSj>E%|@~MM5A^j`;Yz#N5>Q_#%EF
zcO^rSFi1)eNc`fk$<0qG%}KQ@QUr1tfw=hcWJP8fE|CiiP&C<{xt8?<10$pE<m1e0
Lyg(Yv0UH7UJ+4f`

diff --git a/ziffers/mapper.py b/ziffers/mapper.py
index 21f921b..78b3e05 100644
--- a/ziffers/mapper.py
+++ b/ziffers/mapper.py
@@ -1,7 +1,7 @@
-from lark import Lark, Transformer
-from classes import *
-from common import flatten
-from defaults import default_durs
+from lark import Transformer
+from .classes import *
+from .common import flatten
+from .defaults import default_durs
 from collections import Counter
 
 class ZiffersTransformer(Transformer):
@@ -87,4 +87,4 @@ class ZiffersTransformer(Transformer):
         return Subdivision(values=values,text="["+"".join([val.text for val in values])+"]")
 
     def subitems(self,s):
-        return s
\ No newline at end of file
+        return s
diff --git a/ziffers/parser.py b/ziffers/parser.py
index 74aad8e..b131aaa 100644
--- a/ziffers/parser.py
+++ b/ziffers/parser.py
@@ -1,5 +1,5 @@
 from rich import print
-from mapper import *
+from .mapper import *
 from pathlib import Path
 from lark import Lark