From 8ba9b37ec9243bbbe143e0403230457e2580e88b Mon Sep 17 00:00:00 2001
From: Dion Moult <dion@thinkmoult.com>
Date: Mon, 16 Mar 2020 14:54:45 +1100
Subject: [PATCH] Add icon and embed common.lark for packaging IFCCSV

---
 src/ifccsv/icon.ico  | Bin 0 -> 4286 bytes
 src/ifccsv/ifccsv.py |  30 ++++++++++++++++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 src/ifccsv/icon.ico

diff --git a/src/ifccsv/icon.ico b/src/ifccsv/icon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..3b7a67ba202dfcde19d02b389042fbc4734ed865
GIT binary patch
literal 4286
zcmd5=TTfJ17(M+5ee&6)4{BmY@q&ssV9tPo%FPQfBf%K&;XxBIF=~hk8lyPqGx#X@
z&}dr$+W>Q6E@v(xHbnt75*c8kwABY0nl!6>ZF8uZke-d1wB2OQ`Odf3x7OZg&Yr!4
zrhO&;7BANLskMKtX^S*XTPh$@TCM=|vWdQLY@hHcp=tP^wfD2{(e|_r?wA`bv6hU0
zTGXVrRZDzKz}{!al7~yMtaDjLKrL!g+o~mI5-1E7VtLPU*m`Xl0kx<}ZL2mhGlA{F
z?XdOOu(Ee$MnElUQroJLQxqz~iry8->dVRqs6|ax{~e(n$m-3)>b}((0kx>9>c2C*
z6RSL{u*S0{BcK*FRsDB`cS+xDPc}@f^{iDM3%O<;ubc-pRsBoDrO5VXW4(9%9PIse
zFi(_(OXlMFa^!wqOD*zL{3mB7QD&53op&8JcsEE;>)g;eTphWJvqNXm`nnZYMy|-1
z_l%iiOb)rMG3%*CO=?>;a>|WzS)b$00YROHXAL+!a2O?_5?mj>E@N}<%rnP6#^kcb
ztmjy$spOxUM1@g-9A6GL`8G*x^le1ba1)wGn{j^VJnp`^iyNaiWXyZU%rPd1T-KQN
z)S~93(6(yi>^64G`pv%0AgFWk`9&Oiat!6+a_PsIngnBxfqjh0WsO<Su~1Xhe{W<j
zw)nSTtADEmV}7qUU);onXBW^u-j3!M%`)aaW9Ar>LvDIKHC6p9BbCVY=OWLaC&Bpg
z@MWABJR#>nkK=>Ku_v-ef-!TPBRS-z*Hd#UHD&eqC8sJ{g}nYe<oD-GFupc=4epn2
zG(2xWN1|gc<~{SwnK8NP_0&}LuZ~trU#??<<KR10H&};#k$q@+*@C*Kb*PM1N-$=Q
zedLhK8nd3yvC0tsGivj9#+=XtIvfFq1Y@qR+plip((ol2bItQP6O7r<K5`hF^}1h2
zeosECgVoCZu9!>u76b}Fa2$=pjo`TK0lU<uemdAk4!Nu;@D)J+Nr(MMkq<bP{cGYi
z^1QGuxD5o)4oxFXxb^B58b=ys%=>h(j~wRd?dTTIuhRj&TZhZ<QueQn*UIxkQLqRm
z_--?=f{H)|91n%}cLKbMF}S?K|D*NypG+lD`?yw~7m7p0Fv0VKIhKFA7J3SyKM>!|
zx8nVIAiTd9^Z!AIvrjyKMgIej4@h6085V-Fa2ZZTPN6<jk9tEOQjasyGdLYR4fii@
zeE8#o<@)FR4-OoZ=LPQBs^Iy8Yn=OF$9RYQJ>+j9_l2&hE=<o(TY8f~|3d?Z=H27X
z{cgT1&jik>6Rl%^`_sE~suS;K-zj;U{@g=LjZ(R1bKh10`CPYcV{N!MeoxN7E7`Rm
z@6Y||$vs;Y<kSDo*d6)&yOZ4u_BQ>G4jh&HD%YGUxDVIFYNY?8<fAY0rvKa7w>bIp
zN$ijB2Y-iDLH>~^M{s}QzVf?9zx0;+Gllr?afE&iEf~gc#uv{!eH{PRz4?ED|LXb|
DZ<{S^

literal 0
HcmV?d00001

diff --git a/src/ifccsv/ifccsv.py b/src/ifccsv/ifccsv.py
index 06175492bc..f25ea8c88e 100644
--- a/src/ifccsv/ifccsv.py
+++ b/src/ifccsv/ifccsv.py
@@ -35,10 +35,32 @@ class IfcSelectorParser():
                     morethan: ">"
                     lessthan: "<"
 
-                    %import common.WORD   // imports from terminal library
-                    %import common.ESCAPED_STRING
-                    %import common.WS
-                    %ignore WS           // Disregard spaces in text
+                    // Embed common.lark for packaging
+                    DIGIT: "0".."9"
+                    HEXDIGIT: "a".."f"|"A".."F"|DIGIT
+                    INT: DIGIT+
+                    SIGNED_INT: ["+"|"-"] INT
+                    DECIMAL: INT "." INT? | "." INT
+                    _EXP: ("e"|"E") SIGNED_INT
+                    FLOAT: INT _EXP | DECIMAL _EXP?
+                    SIGNED_FLOAT: ["+"|"-"] FLOAT
+                    NUMBER: FLOAT | INT
+                    SIGNED_NUMBER: ["+"|"-"] NUMBER
+                    _STRING_INNER: /.*?/
+                    _STRING_ESC_INNER: _STRING_INNER /(?<!\\\\)(\\\\\\\\)*?/
+                    ESCAPED_STRING : "\\"" _STRING_ESC_INNER "\\""
+                    LCASE_LETTER: "a".."z"
+                    UCASE_LETTER: "A".."Z"
+                    LETTER: UCASE_LETTER | LCASE_LETTER
+                    WORD: LETTER+
+                    CNAME: ("_"|LETTER) ("_"|LETTER|DIGIT)*
+                    WS_INLINE: (" "|/\\t/)+
+                    WS: /[ \\t\\f\\r\\n]/+
+                    CR : /\\r/
+                    LF : /\\n/
+                    NEWLINE: (CR? LF)+
+
+                    %ignore WS // Disregard spaces in text
                  ''')
 
         start = l.parse(self.query)