diff_b4ef.patch

diff -d -r -u -p nimcache/spcounter.c nimcache_b4ef/spcounter.c
--- nimcache/spcounter.c	2018-02-05 12:21:01.000000000 +0300
+++ nimcache_b4ef/spcounter.c	2018-02-05 20:09:00.705877000 +0300
@@ -3,7 +3,7 @@
 /* The generated code is subject to the original license. */
 /* Compiled for: Linux, amd64, gcc */
 /* Command for C compiler:
-   gcc -c  -w -DPACKAGE  -I/usr/lib/nim -o /tmp/yaourt-tmp-john/aur-steamforwarder-git/src/SteamForwarder/tools/nimcache/spcounter.o /tmp/yaourt-tmp-john/aur-steamforwarder-git/src/SteamForwarder/tools/nimcache/spcounter.c */
+   gcc -c  -w -DPACKAGE  -I/usr/lib/nim -o /home/xomachine/.Soft/builds/aur/steamforwarder-git/src/SteamForwarder/tools/nimcache/spcounter.o /home/xomachine/.Soft/builds/aur/steamforwarder-git/src/SteamForwarder/tools/nimcache/spcounter.c */
 #define NIM_NEW_MANGLING_RULES
 #define NIM_INTBITS 64
 
@@ -189,6 +189,9 @@ extern TFrame* framePtr_HRfVMH3jYeBJz6Q6
 extern TNimType NTI_pUxI6Ljo6IKKHXKOZkQ7Og_;
 extern TNimType NTI_2c0OS57pWBoUvzJMEXmehg_;
 extern TNimType NTI_zjMaDBasw1LnKbj11akpfw_;
+TNimType NTI_pfrdooyxJsC6cg34ebuBag_;
+extern TNimType NTI_rR5Bzr1D5krxoo1NcNyeMA_;
+extern TNimType NTI_VaVACK0bpYmqIQ0mKcHfQQ_;
 static NIM_CONST tySet_tyChar_nmiMWKVIe46vacnhAFrQvw TM_nGR075lgf8HE5Tj17puwxA_2 = {
 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00,
 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1451,5 +1454,23 @@ NIM_EXTERNC N_NOINLINE(void, unknown_spc
 }
 
 NIM_EXTERNC N_NOINLINE(void, unknown_spcounterDatInit000)(void) {
+static TNimNode* TM_nGR075lgf8HE5Tj17puwxA_51[2];
+static TNimNode TM_nGR075lgf8HE5Tj17puwxA_0[3];
+NTI_pfrdooyxJsC6cg34ebuBag_.size = sizeof(tyTuple_pfrdooyxJsC6cg34ebuBag);
+NTI_pfrdooyxJsC6cg34ebuBag_.kind = 18;
+NTI_pfrdooyxJsC6cg34ebuBag_.base = 0;
+NTI_pfrdooyxJsC6cg34ebuBag_.flags = 3;
+TM_nGR075lgf8HE5Tj17puwxA_51[0] = &TM_nGR075lgf8HE5Tj17puwxA_0[1];
+TM_nGR075lgf8HE5Tj17puwxA_0[1].kind = 1;
+TM_nGR075lgf8HE5Tj17puwxA_0[1].offset = offsetof(tyTuple_pfrdooyxJsC6cg34ebuBag, Field0);
+TM_nGR075lgf8HE5Tj17puwxA_0[1].typ = (&NTI_rR5Bzr1D5krxoo1NcNyeMA_);
+TM_nGR075lgf8HE5Tj17puwxA_0[1].name = "Field0";
+TM_nGR075lgf8HE5Tj17puwxA_51[1] = &TM_nGR075lgf8HE5Tj17puwxA_0[2];
+TM_nGR075lgf8HE5Tj17puwxA_0[2].kind = 1;
+TM_nGR075lgf8HE5Tj17puwxA_0[2].offset = offsetof(tyTuple_pfrdooyxJsC6cg34ebuBag, Field1);
+TM_nGR075lgf8HE5Tj17puwxA_0[2].typ = (&NTI_VaVACK0bpYmqIQ0mKcHfQQ_);
+TM_nGR075lgf8HE5Tj17puwxA_0[2].name = "Field1";
+TM_nGR075lgf8HE5Tj17puwxA_0[0].len = 2; TM_nGR075lgf8HE5Tj17puwxA_0[0].kind = 2; TM_nGR075lgf8HE5Tj17puwxA_0[0].sons = &TM_nGR075lgf8HE5Tj17puwxA_51[0];
+NTI_pfrdooyxJsC6cg34ebuBag_.node = &TM_nGR075lgf8HE5Tj17puwxA_0[0];
 }

diff -d -r -u -p nimcache/stdlib_system.c nimcache_b4ef/stdlib_system.c
--- nimcache/stdlib_system.c	2018-02-05 12:21:01.000000000 +0300
+++ nimcache_b4ef/stdlib_system.c	2018-02-05 20:09:00.695877000 +0300
@@ -3,7 +3,7 @@
 /* The generated code is subject to the original license. */
 /* Compiled for: Linux, amd64, gcc */
 /* Command for C compiler:
-   gcc -c  -w -DPACKAGE  -I/usr/lib/nim -o /tmp/yaourt-tmp-john/aur-steamforwarder-git/src/SteamForwarder/tools/nimcache/stdlib_system.o /tmp/yaourt-tmp-john/aur-steamforwarder-git/src/SteamForwarder/tools/nimcache/stdlib_system.c */
+   gcc -c  -w -DPACKAGE  -I/usr/lib/nim -o /home/xomachine/.Soft/builds/aur/steamforwarder-git/src/SteamForwarder/tools/nimcache/stdlib_system.o /home/xomachine/.Soft/builds/aur/steamforwarder-git/src/SteamForwarder/tools/nimcache/stdlib_system.c */
 #define NIM_NEW_MANGLING_RULES
 #define NIM_INTBITS 64
 
@@ -14544,36 +14544,3 @@ NTI_axqhRnwd09cVJkRcojfw6mA_.base = (&NT
 NTI_axqhRnwd09cVJkRcojfw6mA_.marker = Marker_tyRef_axqhRnwd09cVJkRcojfw6mA;
 }
 
-xOLtcuhlSBHl64t5w_.kind = 24;
-NTI_l0xXJxOLtcuhlSBHl64t5w_.base = (&NTI_Ryg5db24dBRIzTUa2BQTPg_);
-NTI_l0xXJxOLtcuhlSBHl64t5w_.marker = Marker_tySequence_l0xXJxOLtcuhlSBHl64t5w;
-NTI_z9ac6Ez5VSEHe9bC2NMwuc7Q_.size = sizeof(void*);
-NTI_z9ac6Ez5VSEHe9bC2NMwuc7Q_.kind = 16;
-NTI_z9ac6Ez5VSEHe9bC2NMwuc7Q_.base = (&NTI_S9agCYBinaYZnGWcjTdxclg_);
-NTI_z9ac6Ez5VSEHe9bC2NMwuc7Q_.flags = 3;
-NTI_Txh9bzc0AU9bDpIbDdD6jBsQ_.size = sizeof(NCSTRING*);
-NTI_Txh9bzc0AU9bDpIbDdD6jBsQ_.kind = 21;
-NTI_Txh9bzc0AU9bDpIbDdD6jBsQ_.base = (&NTI_z9ac6Ez5VSEHe9bC2NMwuc7Q_);
-NTI_Txh9bzc0AU9bDpIbDdD6jBsQ_.flags = 3;
-NTI_JrFyJbYm9b5I4hJ9cWDqvfYA_.size = sizeof(NU32);
-NTI_JrFyJbYm9b5I4hJ9cWDqvfYA_.kind = 43;
-NTI_JrFyJbYm9b5I4hJ9cWDqvfYA_.base = 0;
-NTI_JrFyJbYm9b5I4hJ9cWDqvfYA_.flags = 3;
-NTI_QWjO7DeBe4JXzAQ7U2IKqQ_.size = sizeof(tyObject_HSlice_QWjO7DeBe4JXzAQ7U2IKqQ);
-NTI_QWjO7DeBe4JXzAQ7U2IKqQ_.kind = 18;
-NTI_QWjO7DeBe4JXzAQ7U2IKqQ_.base = 0;
-NTI_QWjO7DeBe4JXzAQ7U2IKqQ_.flags = 3;
-TM_Q5wkpxktOdTGvlSRo9bzt9aw_161[0] = &TM_Q5wkpxktOdTGvlSRo9bzt9aw_0[126];
-TM_Q5wkpxktOdTGvlSRo9bzt9aw_0[126].kind = 1;
-TM_Q5wkpxktOdTGvlSRo9bzt9aw_0[126].offset = offsetof(tyObject_HSlice_QWjO7DeBe4JXzAQ7U2IKqQ, a);
-TM_Q5wkpxktOdTGvlSRo9bzt9aw_0[126].typ = (&NTI_JrFyJbYm9b5I4hJ9cWDqvfYA_);
-TM_Q5wkpxktOdTGvlSRo9bzt9aw_0[126].name = "a";
-TM_Q5wkpxktOdTGvlSRo9bzt9aw_161[1] = &TM_Q5wkpxktOdTGvlSRo9bzt9aw_0[127];
-TM_Q5wkpxktOdTGvlSRo9bzt9aw_0[127].kind = 1;
-TM_Q5wkpxktOdTGvlSRo9bzt9aw_0[127].offset = offsetof(tyObject_HSlice_QWjO7DeBe4JXzAQ7U2IKqQ, b);
-TM_Q5wkpxktOdTGvlSRo9bzt9aw_0[127].typ = (&NTI_JrFyJbYm9b5I4hJ9cWDqvfYA_);
-TM_Q5wkpxktOdTGvlSRo9bzt9aw_0[127].name = "b";
-TM_Q5wkpxktOdTGvlSRo9bzt9aw_0[125].len = 2; TM_Q5wkpxktOdTGvlSRo9bzt9aw_0[125].kind = 2; TM_Q5wkpxktOdTGvlSRo9bzt9aw_0[125].sons = &TM_Q5wkpxktOdTGvlSRo9bzt9aw_161[0];
-NTI_QWjO7DeBe4JXzAQ7U2IKqQ_.node = &TM_Q5wkpxktOdTGvlSRo9bzt9aw_0[125];
-}
-
diff -d -r -u -p nimcache/stdlib_tables.c nimcache_b4ef/stdlib_tables.c
--- nimcache/stdlib_tables.c	2018-02-05 12:21:01.000000000 +0300
+++ nimcache_b4ef/stdlib_tables.c	2018-02-05 20:09:00.702543000 +0300
@@ -3,7 +3,7 @@
 /* The generated code is subject to the original license. */
 /* Compiled for: Linux, amd64, gcc */
 /* Command for C compiler:
-   gcc -c  -w -DPACKAGE  -I/usr/lib/nim -o /tmp/yaourt-tmp-john/aur-steamforwarder-git/src/SteamForwarder/tools/nimcache/stdlib_tables.o /tmp/yaourt-tmp-john/aur-steamforwarder-git/src/SteamForwarder/tools/nimcache/stdlib_tables.c */
+   gcc -c  -w -DPACKAGE  -I/usr/lib/nim -o /home/xomachine/.Soft/builds/aur/steamforwarder-git/src/SteamForwarder/tools/nimcache/stdlib_tables.o /home/xomachine/.Soft/builds/aur/steamforwarder-git/src/SteamForwarder/tools/nimcache/stdlib_tables.c */
 #define NIM_NEW_MANGLING_RULES
 #define NIM_INTBITS 64
 
@@ -23,9 +23,10 @@
 #undef unix
 typedef struct NimStringDesc NimStringDesc;
 typedef struct TGenericSeq TGenericSeq;
-typedef struct tyObject_Table_zjMaDBasw1LnKbj11akpfw tyObject_Table_zjMaDBasw1LnKbj11akpfw;
-typedef struct tySequence_pUxI6Ljo6IKKHXKOZkQ7Og tySequence_pUxI6Ljo6IKKHXKOZkQ7Og;
-typedef struct tyTuple_sr3s7uVHpu9cEbbDnCSg8yQ tyTuple_sr3s7uVHpu9cEbbDnCSg8yQ;
+typedef struct tyObject_OrderedTable_O5h9b2DHiZ9as6IlqEXhDAkg tyObject_OrderedTable_O5h9b2DHiZ9as6IlqEXhDAkg;
+typedef struct tySequence_P9aLWDkBxPmAKZ1JjVQHqMQ tySequence_P9aLWDkBxPmAKZ1JjVQHqMQ;
+typedef struct tyTuple_Es9aMzZJysXteLK5qQXSB6A tyTuple_Es9aMzZJysXteLK5qQXSB6A;
+typedef struct tyObject_Symbol_N1BkV8GruUUMOwgDkGXgUA tyObject_Symbol_N1BkV8GruUUMOwgDkGXgUA;
 typedef struct TNimType TNimType;
 typedef struct TNimNode TNimNode;
 typedef struct tyObject_Cell_1zcF9cV8XIAtbN8h5HRUB8g tyObject_Cell_1zcF9cV8XIAtbN8h5HRUB8g;
@@ -44,11 +45,18 @@ typedef struct tyTuple_ujsjpB2O9cjj3uDHs
 typedef struct tyObject_GcStat_0RwLoVBHZPfUAcLczmfQAg tyObject_GcStat_0RwLoVBHZPfUAcLczmfQAg;
 typedef struct tyObject_CellSet_jG87P0AI9aZtss9ccTYBIISQ tyObject_CellSet_jG87P0AI9aZtss9ccTYBIISQ;
 typedef struct tyObject_PageDesc_fublkgIY4LG3mT51LU2WHg tyObject_PageDesc_fublkgIY4LG3mT51LU2WHg;
+typedef struct tyObject_Table_zjMaDBasw1LnKbj11akpfw tyObject_Table_zjMaDBasw1LnKbj11akpfw;
+typedef struct tySequence_pUxI6Ljo6IKKHXKOZkQ7Og tySequence_pUxI6Ljo6IKKHXKOZkQ7Og;
+typedef struct tyTuple_sr3s7uVHpu9cEbbDnCSg8yQ tyTuple_sr3s7uVHpu9cEbbDnCSg8yQ;
 typedef struct tyObject_KeyError_ifYAhUumNzWR9c9cN9amyJLtg tyObject_KeyError_ifYAhUumNzWR9c9cN9amyJLtg;
 typedef struct tyObject_ValueError_Gi06FkNeykJn7mrqRZYrkA tyObject_ValueError_Gi06FkNeykJn7mrqRZYrkA;
 typedef struct Exception Exception;
 typedef struct RootObj RootObj;
 typedef struct tySequence_uB9b75OUPRENsBAu4AnoePA tySequence_uB9b75OUPRENsBAu4AnoePA;
+typedef struct tyObject_Table_PACZxzsw3jicSea9ai2ghqw tyObject_Table_PACZxzsw3jicSea9ai2ghqw;
+typedef struct tySequence_bOjjMbz7oXMD4ISKoDha4A tySequence_bOjjMbz7oXMD4ISKoDha4A;
+typedef struct tyTuple_2FVElvR0r3KpHu9aezPjm5w tyTuple_2FVElvR0r3KpHu9aezPjm5w;
+typedef struct tyTuple_pfrdooyxJsC6cg34ebuBag tyTuple_pfrdooyxJsC6cg34ebuBag;
 typedef struct tyObject_BaseChunk_Sdq7WpT6qAH858F5ZEdG3w tyObject_BaseChunk_Sdq7WpT6qAH858F5ZEdG3w;
 typedef struct tyObject_FreeCell_u6M5LHprqzkn9axr04yg9bGQ tyObject_FreeCell_u6M5LHprqzkn9axr04yg9bGQ;
 typedef struct tyObject_StackTraceEntry_oLyohQ7O2XOvGnflOss8EA tyObject_StackTraceEntry_oLyohQ7O2XOvGnflOss8EA;
@@ -60,14 +68,22 @@ struct NimStringDesc {
   TGenericSeq Sup;
 NIM_CHAR data[SEQ_DECL_SIZE];
 };
-struct tyObject_Table_zjMaDBasw1LnKbj11akpfw {
-tySequence_pUxI6Ljo6IKKHXKOZkQ7Og* data;
+struct tyObject_OrderedTable_O5h9b2DHiZ9as6IlqEXhDAkg {
+tySequence_P9aLWDkBxPmAKZ1JjVQHqMQ* data;
 NI counter;
+NI first;
+NI last;
 };
-struct tyTuple_sr3s7uVHpu9cEbbDnCSg8yQ {
+struct tyObject_Symbol_N1BkV8GruUUMOwgDkGXgUA {
+NI idx;
+NimStringDesc* callconv;
+NimStringDesc* name;
+};
+struct tyTuple_Es9aMzZJysXteLK5qQXSB6A {
 NI Field0;
-NimStringDesc* Field1;
-NI Field2;
+NI Field1;
+NimStringDesc* Field2;
+tyObject_Symbol_N1BkV8GruUUMOwgDkGXgUA Field3;
 };
 typedef NU8 tyEnum_TNimKind_jIBKr1ejBgsfM33Kxw4j7A;
 typedef NU8 tySet_tyEnum_TNimTypeFlag_v8QUszD1sWlSIWZz7mC4bQ;
@@ -181,6 +197,15 @@ tyObject_CellSet_jG87P0AI9aZtss9ccTYBIIS
 tyObject_CellSeq_Axo1XVm9aaQueTOldv8le5w additionalRoots;
 NI gcThreadId;
 };
+struct tyObject_Table_zjMaDBasw1LnKbj11akpfw {
+tySequence_pUxI6Ljo6IKKHXKOZkQ7Og* data;
+NI counter;
+};
+struct tyTuple_sr3s7uVHpu9cEbbDnCSg8yQ {
+NI Field0;
+NimStringDesc* Field1;
+NI Field2;
+};
 struct RootObj {
 TNimType* m_type;
 };
@@ -198,6 +223,19 @@ struct tyObject_ValueError_Gi06FkNeykJn7
 struct tyObject_KeyError_ifYAhUumNzWR9c9cN9amyJLtg {
   tyObject_ValueError_Gi06FkNeykJn7mrqRZYrkA Sup;
 };
+struct tyObject_Table_PACZxzsw3jicSea9ai2ghqw {
+tySequence_bOjjMbz7oXMD4ISKoDha4A* data;
+NI counter;
+};
+struct tyTuple_pfrdooyxJsC6cg34ebuBag {
+NI Field0;
+NIM_BOOL Field1;
+};
+struct tyTuple_2FVElvR0r3KpHu9aezPjm5w {
+NI Field0;
+NimStringDesc* Field1;
+tyTuple_pfrdooyxJsC6cg34ebuBag Field2;
+};
 struct tyObject_BaseChunk_Sdq7WpT6qAH858F5ZEdG3w {
 NI prevSize;
 NI size;
@@ -242,10 +280,18 @@ struct tyObject_FreeCell_u6M5LHprqzkn9ax
 tyObject_FreeCell_u6M5LHprqzkn9axr04yg9bGQ* next;
 NI zeroField;
 };
+struct tySequence_P9aLWDkBxPmAKZ1JjVQHqMQ {
+  TGenericSeq Sup;
+  tyTuple_Es9aMzZJysXteLK5qQXSB6A data[SEQ_DECL_SIZE];
+};
 struct tySequence_pUxI6Ljo6IKKHXKOZkQ7Og {
   TGenericSeq Sup;
   tyTuple_sr3s7uVHpu9cEbbDnCSg8yQ data[SEQ_DECL_SIZE];
 };
+struct tySequence_bOjjMbz7oXMD4ISKoDha4A {
+  TGenericSeq Sup;
+  tyTuple_2FVElvR0r3KpHu9aezPjm5w data[SEQ_DECL_SIZE];
+};
 struct tySequence_uB9b75OUPRENsBAu4AnoePA {
   TGenericSeq Sup;
   tyObject_StackTraceEntry_oLyohQ7O2XOvGnflOss8EA data[SEQ_DECL_SIZE];
@@ -270,21 +316,26 @@ N_LIB_PRIVATE N_NIMCALL(NIM_BOOL, isPowe
 static N_INLINE(NI, chckRange)(NI i, NI a, NI b);
 N_NOINLINE(void, raiseRangeError)(NI64 val);
 N_NIMCALL(void, nimGCvisit)(void* d, NI op);
-static N_NIMCALL(void, Marker_tySequence_pUxI6Ljo6IKKHXKOZkQ7Og)(void* p, NI op);
+static N_NIMCALL(void, Marker_tySequence_P9aLWDkBxPmAKZ1JjVQHqMQ)(void* p, NI op);
 N_NIMCALL(void*, newSeq)(TNimType* typ, NI len);
 N_NIMCALL(void, unsureAsgnRef)(void** dest, void* src);
-static N_INLINE(NI, rawGet_6W1ssjRyuKtSjII2c2v5RQtables)(tyObject_Table_zjMaDBasw1LnKbj11akpfw t, NimStringDesc* key, NI* hc);
+N_LIB_PRIVATE N_NIMCALL(NI, rawGet_tcWZqY5T8nDMjS26B7Nx6g)(tyObject_OrderedTable_O5h9b2DHiZ9as6IlqEXhDAkg* t, NimStringDesc* key, NI* hc);
 N_LIB_PRIVATE N_NIMCALL(NI, hash_uBstFm5SYVQeOL3j9c9bc58A)(NimStringDesc* x);
 N_NOINLINE(void, raiseIndexError)(void);
 static N_INLINE(NIM_BOOL, eqStrings)(NimStringDesc* a, NimStringDesc* b);
 static N_INLINE(NIM_BOOL, equalMem_fmeFeLBvgmAHG9bC8ETS9bYQsystem)(void* a, void* b, NI size);
-N_LIB_PRIVATE N_NIMCALL(void, enlarge_NkEl9bLLrzlYTmLn9cgTZPyg)(tyObject_Table_zjMaDBasw1LnKbj11akpfw* t);
-N_LIB_PRIVATE N_NIMCALL(void, rawInsert_JrnDXRCjxItwEsaMlP5tEA)(tyObject_Table_zjMaDBasw1LnKbj11akpfw* t, tySequence_pUxI6Ljo6IKKHXKOZkQ7Og** data, NimStringDesc* key, NI val, NI hc, NI h);
 N_NIMCALL(NimStringDesc*, copyStringRC1)(NimStringDesc* src);
 static N_INLINE(void, nimGCunrefNoCycle)(void* p);
 static N_INLINE(tyObject_Cell_1zcF9cV8XIAtbN8h5HRUB8g*, usrToCell_yB9aH5WIlwd0xkYrcdPeXrQsystem)(void* usr);
 static N_INLINE(void, rtlAddZCT_MV4BBk6J1qu70IbBxwEn4w_2system)(tyObject_Cell_1zcF9cV8XIAtbN8h5HRUB8g* c);
 N_LIB_PRIVATE N_NOINLINE(void, addZCT_fCDI7oO1NNVXXURtxSzsRw)(tyObject_CellSeq_Axo1XVm9aaQueTOldv8le5w* s, tyObject_Cell_1zcF9cV8XIAtbN8h5HRUB8g* c);
+N_LIB_PRIVATE N_NIMCALL(void, enlarge_DzYTd4mIuZ9cRxhW57WEtCA)(tyObject_OrderedTable_O5h9b2DHiZ9as6IlqEXhDAkg* t);
+N_LIB_PRIVATE N_NIMCALL(void, rawInsert_9bWtlfrUikTbU8fl12N3WwQ)(tyObject_OrderedTable_O5h9b2DHiZ9as6IlqEXhDAkg* t, tySequence_P9aLWDkBxPmAKZ1JjVQHqMQ** data, NimStringDesc* key, tyObject_Symbol_N1BkV8GruUUMOwgDkGXgUA val, NI hc, NI h);
+N_LIB_PRIVATE N_NIMCALL(NI, rawGetKnownHC_flMrYj5wCVtQ1ErLoP9cQXQ)(tyObject_OrderedTable_O5h9b2DHiZ9as6IlqEXhDAkg* t, NimStringDesc* key, NI hc);
+static N_NIMCALL(void, Marker_tySequence_pUxI6Ljo6IKKHXKOZkQ7Og)(void* p, NI op);
+static N_INLINE(NI, rawGet_6W1ssjRyuKtSjII2c2v5RQtables)(tyObject_Table_zjMaDBasw1LnKbj11akpfw t, NimStringDesc* key, NI* hc);
+N_LIB_PRIVATE N_NIMCALL(void, enlarge_NkEl9bLLrzlYTmLn9cgTZPyg)(tyObject_Table_zjMaDBasw1LnKbj11akpfw* t);
+N_LIB_PRIVATE N_NIMCALL(void, rawInsert_JrnDXRCjxItwEsaMlP5tEA)(tyObject_Table_zjMaDBasw1LnKbj11akpfw* t, tySequence_pUxI6Ljo6IKKHXKOZkQ7Og** data, NimStringDesc* key, NI val, NI hc, NI h);
 static N_INLINE(NI, rawGetKnownHC_m6drWlVK9bHkmyhr05CjMNQtables)(tyObject_Table_zjMaDBasw1LnKbj11akpfw t, NimStringDesc* key, NI hc);
 N_NIMCALL(void*, newObj)(TNimType* typ, NI size);
 static N_INLINE(void, appendString)(NimStringDesc* dest, NimStringDesc* src);
@@ -296,18 +347,33 @@ static N_INLINE(void, incRef_9cAA5YuQAAC
 static N_INLINE(void, decRef_MV4BBk6J1qu70IbBxwEn4wsystem)(tyObject_Cell_1zcF9cV8XIAtbN8h5HRUB8g* c);
 N_NIMCALL(void, raiseException)(Exception* e, NCSTRING ename);
 N_LIB_PRIVATE N_NIMCALL(NIM_BOOL, hasKey_DyKLR1cNLT9cYc2bz5XA9cYw_2)(tyObject_Table_zjMaDBasw1LnKbj11akpfw t, NimStringDesc* key);
+N_LIB_PRIVATE N_NIMCALL(NIM_BOOL, hasKey_HKT6OZnEmHzo1Z3izIwLZQ_2)(tyObject_OrderedTable_O5h9b2DHiZ9as6IlqEXhDAkg* t, NimStringDesc* key);
+static N_NIMCALL(void, Marker_tySequence_bOjjMbz7oXMD4ISKoDha4A)(void* p, NI op);
+static N_INLINE(NI, rawGet_SBkxAH9ca7KOhVtJSmwaYeAtables)(tyObject_Table_PACZxzsw3jicSea9ai2ghqw t, NimStringDesc* key, NI* hc);
+N_LIB_PRIVATE N_NIMCALL(void, enlarge_9aDeslpuX9c9bJ0do8WXpQ2ow)(tyObject_Table_PACZxzsw3jicSea9ai2ghqw* t);
+N_LIB_PRIVATE N_NIMCALL(void, rawInsert_8XE6Bccm5rgvZG69aoI89coA)(tyObject_Table_PACZxzsw3jicSea9ai2ghqw* t, tySequence_bOjjMbz7oXMD4ISKoDha4A** data, NimStringDesc* key, tyTuple_pfrdooyxJsC6cg34ebuBag val, NI hc, NI h);
+static N_INLINE(NI, rawGetKnownHC_9aLLajLZ9cxLdcfp84DFJ8tQtables)(tyObject_Table_PACZxzsw3jicSea9ai2ghqw t, NimStringDesc* key, NI hc);
+N_LIB_PRIVATE N_NIMCALL(NIM_BOOL, hasKey_Oi9bcvMPJyGzGx7X1KepzhA_2)(tyObject_Table_PACZxzsw3jicSea9ai2ghqw t, NimStringDesc* key);
 extern TFrame* framePtr_HRfVMH3jYeBJz6Q6X9b6Ptw;
-TNimType NTI_sr3s7uVHpu9cEbbDnCSg8yQ_;
+TNimType NTI_Es9aMzZJysXteLK5qQXSB6A_;
 extern TNimType NTI_rR5Bzr1D5krxoo1NcNyeMA_;
 extern TNimType NTI_77mFvmsOLKik79ci2hXkHEg_;
-TNimType NTI_pUxI6Ljo6IKKHXKOZkQ7Og_;
+extern TNimType NTI_N1BkV8GruUUMOwgDkGXgUA_;
+TNimType NTI_P9aLWDkBxPmAKZ1JjVQHqMQ_;
+TNimType NTI_O5h9b2DHiZ9as6IlqEXhDAkg_;
 extern tyObject_GcHeap_1TRH1TZMaVZTnLNcIHuNFQ gch_IcYaEuuWivYAS86vFMTS3Q;
+TNimType NTI_sr3s7uVHpu9cEbbDnCSg8yQ_;
+TNimType NTI_pUxI6Ljo6IKKHXKOZkQ7Og_;
 extern TNimType NTI_axqhRnwd09cVJkRcojfw6mA_;
 extern TNimType NTI_ifYAhUumNzWR9c9cN9amyJLtg_;
 TNimType NTI_zjMaDBasw1LnKbj11akpfw_;
+TNimType NTI_PACZxzsw3jicSea9ai2ghqw_;
+TNimType NTI_2FVElvR0r3KpHu9aezPjm5w_;
+extern TNimType NTI_pfrdooyxJsC6cg34ebuBag_;
+TNimType NTI_bOjjMbz7oXMD4ISKoDha4A_;
 STRING_LITERAL(TM_4SoG2KRQy3oMm9aUzSLtGrA_2, "\012counter < length ", 18);
 STRING_LITERAL(TM_4SoG2KRQy3oMm9aUzSLtGrA_10, "isPowerOfTwo(initialSize) ", 26);
-STRING_LITERAL(TM_4SoG2KRQy3oMm9aUzSLtGrA_18, "key not found: ", 15);
+STRING_LITERAL(TM_4SoG2KRQy3oMm9aUzSLtGrA_25, "key not found: ", 15);
 
 static N_INLINE(void, nimFrame)(TFrame* s) {
 	NI T1_;
@@ -502,19 +568,21 @@ static N_INLINE(NI, chckRange)(NI i, NI
 	}BeforeRet_: ;
 	return result;
 }
-static N_NIMCALL(void, Marker_tySequence_pUxI6Ljo6IKKHXKOZkQ7Og)(void* p, NI op) {
-	tySequence_pUxI6Ljo6IKKHXKOZkQ7Og* a;
+static N_NIMCALL(void, Marker_tySequence_P9aLWDkBxPmAKZ1JjVQHqMQ)(void* p, NI op) {
+	tySequence_P9aLWDkBxPmAKZ1JjVQHqMQ* a;
 	NI T1_;
-	a = (tySequence_pUxI6Ljo6IKKHXKOZkQ7Og*)p;
+	a = (tySequence_P9aLWDkBxPmAKZ1JjVQHqMQ*)p;
 	T1_ = (NI)0;
 	for (T1_ = 0; T1_ < a->Sup.len; T1_++) {
-	nimGCvisit((void*)a->data[T1_].Field1, op);
+	nimGCvisit((void*)a->data[T1_].Field2, op);
+	nimGCvisit((void*)a->data[T1_].Field3.callconv, op);
+	nimGCvisit((void*)a->data[T1_].Field3.name, op);
 	}
 }
 
-N_LIB_PRIVATE N_NIMCALL(void, initTable_3Cf7Fyn7tUxJRodC9aUxtFw)(NI initialSize, tyObject_Table_zjMaDBasw1LnKbj11akpfw* Result) {
-	nimfr_("initTable", "tables.nim");
-	nimln_(324, "tables.nim");
+N_LIB_PRIVATE N_NIMCALL(void, initOrderedTable_Pa27xKKJzIWadP7w7QXP8Q)(NI initialSize, tyObject_OrderedTable_O5h9b2DHiZ9as6IlqEXhDAkg* Result) {
+	nimfr_("initOrderedTable", "tables.nim");
+	nimln_(627, "tables.nim");
 	{
 		NIM_BOOL T3_;
 		T3_ = (NIM_BOOL)0;
@@ -523,10 +591,14 @@ N_LIB_PRIVATE N_NIMCALL(void, initTable_
 		failedAssertImpl_aDmpBTs9cPuXp0Mp9cfiNeyA(((NimStringDesc*) &TM_4SoG2KRQy3oMm9aUzSLtGrA_10));
 	}
 	LA4_: ;
-	nimln_(325, "tables.nim");
+	nimln_(628, "tables.nim");
 	(*Result).counter = ((NI) 0);
-	nimln_(326, "tables.nim");
-	unsureAsgnRef((void**) (&(*Result).data), (tySequence_pUxI6Ljo6IKKHXKOZkQ7Og*) newSeq((&NTI_pUxI6Ljo6IKKHXKOZkQ7Og_), ((NI)chckRange(initialSize, ((NI) 0), ((NI) IL64(9223372036854775807))))));
+	nimln_(629, "tables.nim");
+	(*Result).first = ((NI) -1);
+	nimln_(630, "tables.nim");
+	(*Result).last = ((NI) -1);
+	nimln_(631, "tables.nim");
+	unsureAsgnRef((void**) (&(*Result).data), (tySequence_P9aLWDkBxPmAKZ1JjVQHqMQ*) newSeq((&NTI_P9aLWDkBxPmAKZ1JjVQHqMQ_), ((NI)chckRange(initialSize, ((NI) 0), ((NI) IL64(9223372036854775807))))));
 	popFrame();
 }
 
@@ -573,12 +645,12 @@ static N_INLINE(NIM_BOOL, eqStrings)(Nim
 	return result;
 }
 
-static N_INLINE(NI, rawGet_6W1ssjRyuKtSjII2c2v5RQtables)(tyObject_Table_zjMaDBasw1LnKbj11akpfw t, NimStringDesc* key, NI* hc) {
+N_LIB_PRIVATE N_NIMCALL(NI, rawGet_tcWZqY5T8nDMjS26B7Nx6g)(tyObject_OrderedTable_O5h9b2DHiZ9as6IlqEXhDAkg* t, NimStringDesc* key, NI* hc) {
 	NI result;
 	NI h;
 	NI T5_;
-	NI TM_4SoG2KRQy3oMm9aUzSLtGrA_12;
-	nimfr_("rawGet", "tableimpl.nim");
+	NI TM_4SoG2KRQy3oMm9aUzSLtGrA_13;
+	nimfr_("rawGet", "tables.nim");
 {	result = (NI)0;
 	nimln_(53, "tableimpl.nim");
 	(*hc) = hash_uBstFm5SYVQeOL3j9c9bc58A(key);
@@ -590,26 +662,26 @@ static N_INLINE(NI, rawGet_6W1ssjRyuKtSj
 	LA3_: ;
 	nimln_(31, "tableimpl.nim");
 	nimln_(116, "tables.nim");
-	T5_ = (t.data ? (t.data->Sup.len-1) : -1);
+	T5_ = ((*t).data ? ((*t).data->Sup.len-1) : -1);
 	h = (NI)((*hc) & T5_);
 	{
 		nimln_(32, "tableimpl.nim");
 		while (1) {
 			NIM_BOOL T8_;
 			NI T15_;
-			if ((NU)(h) >= (NU)(t.data->Sup.len)) raiseIndexError();
+			if ((NU)(h) >= (NU)((*t).data->Sup.len)) raiseIndexError();
 			T8_ = (NIM_BOOL)0;
-			T8_ = isFilled_IxXD1UAPoEehVDW9cv9cRaew_2tables(t.data->data[h].Field0);
+			T8_ = isFilled_IxXD1UAPoEehVDW9cv9cRaew_2tables((*t).data->data[h].Field0);
 			if (!T8_) goto LA7;
 			nimln_(37, "tableimpl.nim");
 			{
 				NIM_BOOL T11_;
 				T11_ = (NIM_BOOL)0;
-				if ((NU)(h) >= (NU)(t.data->Sup.len)) raiseIndexError();
-				T11_ = (t.data->data[h].Field0 == (*hc));
+				if ((NU)(h) >= (NU)((*t).data->Sup.len)) raiseIndexError();
+				T11_ = ((*t).data->data[h].Field0 == (*hc));
 				if (!(T11_)) goto LA12_;
-				if ((NU)(h) >= (NU)(t.data->Sup.len)) raiseIndexError();
-				T11_ = eqStrings(t.data->data[h].Field1, key);
+				if ((NU)(h) >= (NU)((*t).data->Sup.len)) raiseIndexError();
+				T11_ = eqStrings((*t).data->data[h].Field2, key);
 				LA12_: ;
 				if (!T11_) goto LA13_;
 				nimln_(38, "tableimpl.nim");
@@ -619,13 +691,13 @@ static N_INLINE(NI, rawGet_6W1ssjRyuKtSj
 			LA13_: ;
 			nimln_(39, "tableimpl.nim");
 			nimln_(116, "tables.nim");
-			T15_ = (t.data ? (t.data->Sup.len-1) : -1);
+			T15_ = ((*t).data ? ((*t).data->Sup.len-1) : -1);
 			h = nextTry_OLPhxSyW9bte5CwHzzQVhfAtables(h, T15_);
 		} LA7: ;
 	}
 	nimln_(40, "tableimpl.nim");
-	TM_4SoG2KRQy3oMm9aUzSLtGrA_12 = subInt(((NI) -1), h);
-	result = (NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_12);
+	TM_4SoG2KRQy3oMm9aUzSLtGrA_13 = subInt(((NI) -1), h);
+	result = (NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_13);
 	}BeforeRet_: ;
 	popFrame();
 	return result;
@@ -664,6 +736,315 @@ static N_INLINE(void, nimGCunrefNoCycle)
 	popFrame();
 }
 
+N_LIB_PRIVATE N_NIMCALL(void, rawInsert_9bWtlfrUikTbU8fl12N3WwQ)(tyObject_OrderedTable_O5h9b2DHiZ9as6IlqEXhDAkg* t, tySequence_P9aLWDkBxPmAKZ1JjVQHqMQ** data, NimStringDesc* key, tyObject_Symbol_N1BkV8GruUUMOwgDkGXgUA val, NI hc, NI h) {
+	NimStringDesc* T1_;
+	NimStringDesc* T2_;
+	NimStringDesc* T3_;
+	nimfr_("rawInsert", "tables.nim");
+	if ((NU)(h) >= (NU)((*data)->Sup.len)) raiseIndexError();
+	nimln_(64, "tableimpl.nim");
+	T1_ = (NimStringDesc*)0;
+	T1_ = (*data)->data[h].Field2; (*data)->data[h].Field2 = copyStringRC1(key);
+	if (T1_) nimGCunrefNoCycle(T1_);
+	if ((NU)(h) >= (NU)((*data)->Sup.len)) raiseIndexError();
+	nimln_(65, "tableimpl.nim");
+	(*data)->data[h].Field3.idx = val.idx;
+	T2_ = (NimStringDesc*)0;
+	T2_ = (*data)->data[h].Field3.callconv; (*data)->data[h].Field3.callconv = copyStringRC1(val.callconv);
+	if (T2_) nimGCunrefNoCycle(T2_);
+	T3_ = (NimStringDesc*)0;
+	T3_ = (*data)->data[h].Field3.name; (*data)->data[h].Field3.name = copyStringRC1(val.name);
+	if (T3_) nimGCunrefNoCycle(T3_);
+	if ((NU)(h) >= (NU)((*data)->Sup.len)) raiseIndexError();
+	nimln_(66, "tableimpl.nim");
+	(*data)->data[h].Field0 = hc;
+	if ((NU)(h) >= (NU)((*data)->Sup.len)) raiseIndexError();
+	nimln_(581, "tables.nim");
+	(*data)->data[h].Field1 = ((NI) -1);
+	nimln_(582, "tables.nim");
+	{
+		if (!((*t).first < ((NI) 0))) goto LA6_;
+		(*t).first = h;
+	}
+	LA6_: ;
+	nimln_(583, "tables.nim");
+	{
+		if (!(((NI) 0) <= (*t).last)) goto LA10_;
+		if ((NU)((*t).last) >= (NU)((*data)->Sup.len)) raiseIndexError();
+		(*data)->data[(*t).last].Field1 = h;
+	}
+	LA10_: ;
+	nimln_(584, "tables.nim");
+	(*t).last = h;
+	popFrame();
+}
+
+N_LIB_PRIVATE N_NIMCALL(void, enlarge_DzYTd4mIuZ9cRxhW57WEtCA)(tyObject_OrderedTable_O5h9b2DHiZ9as6IlqEXhDAkg* t) {
+	tySequence_P9aLWDkBxPmAKZ1JjVQHqMQ* n;
+	NI T1_;
+	NI TM_4SoG2KRQy3oMm9aUzSLtGrA_14;
+	NI h;
+	tySequence_P9aLWDkBxPmAKZ1JjVQHqMQ* T2_;
+	nimfr_("enlarge", "tables.nim");
+	n = (tySequence_P9aLWDkBxPmAKZ1JjVQHqMQ*)0;
+	nimln_(588, "tables.nim");
+	T1_ = ((*t).data ? (*t).data->Sup.len : 0);
+	TM_4SoG2KRQy3oMm9aUzSLtGrA_14 = mulInt(T1_, ((NI) 2));
+	n = (tySequence_P9aLWDkBxPmAKZ1JjVQHqMQ*) newSeq((&NTI_P9aLWDkBxPmAKZ1JjVQHqMQ_), ((NI)chckRange((NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_14), ((NI) 0), ((NI) IL64(9223372036854775807)))));
+	nimln_(589, "tables.nim");
+	h = (*t).first;
+	nimln_(590, "tables.nim");
+	(*t).first = ((NI) -1);
+	nimln_(591, "tables.nim");
+	(*t).last = ((NI) -1);
+	nimln_(592, "tables.nim");
+	T2_ = (tySequence_P9aLWDkBxPmAKZ1JjVQHqMQ*)0;
+	T2_ = (*t).data;
+	unsureAsgnRef((void**) (&(*t).data), n);
+	n = T2_;
+	{
+		nimln_(593, "tables.nim");
+		while (1) {
+			NI nxt;
+			NI eh;
+			if (!(((NI) 0) <= h)) goto LA4;
+			nimln_(594, "tables.nim");
+			if ((NU)(h) >= (NU)(n->Sup.len)) raiseIndexError();
+			nxt = n->data[h].Field1;
+			nimln_(595, "tables.nim");
+			if ((NU)(h) >= (NU)(n->Sup.len)) raiseIndexError();
+			eh = n->data[h].Field0;
+			nimln_(596, "tables.nim");
+			{
+				NIM_BOOL T7_;
+				NI j;
+				NI T10_;
+				T7_ = (NIM_BOOL)0;
+				T7_ = isFilled_IxXD1UAPoEehVDW9cv9cRaew_2tables(eh);
+				if (!T7_) goto LA8_;
+				nimln_(597, "tables.nim");
+				nimln_(116, "tables.nim");
+				T10_ = ((*t).data ? ((*t).data->Sup.len-1) : -1);
+				j = (NI)(eh & T10_);
+				{
+					nimln_(598, "tables.nim");
+					while (1) {
+						NIM_BOOL T13_;
+						NI T14_;
+						if ((NU)(j) >= (NU)((*t).data->Sup.len)) raiseIndexError();
+						T13_ = (NIM_BOOL)0;
+						T13_ = isFilled_IxXD1UAPoEehVDW9cv9cRaew_2tables((*t).data->data[j].Field0);
+						if (!T13_) goto LA12;
+						nimln_(599, "tables.nim");
+						nimln_(116, "tables.nim");
+						T14_ = ((*t).data ? ((*t).data->Sup.len-1) : -1);
+						j = nextTry_OLPhxSyW9bte5CwHzzQVhfAtables(j, T14_);
+					} LA12: ;
+				}
+				nimln_(600, "tables.nim");
+				if ((NU)(h) >= (NU)(n->Sup.len)) raiseIndexError();
+				if ((NU)(h) >= (NU)(n->Sup.len)) raiseIndexError();
+				if ((NU)(h) >= (NU)(n->Sup.len)) raiseIndexError();
+				rawInsert_9bWtlfrUikTbU8fl12N3WwQ(t, (&(*t).data), n->data[h].Field2, n->data[h].Field3, n->data[h].Field0, j);
+			}
+			LA8_: ;
+			nimln_(601, "tables.nim");
+			h = nxt;
+		} LA4: ;
+	}
+	popFrame();
+}
+
+N_LIB_PRIVATE N_NIMCALL(NI, rawGetKnownHC_flMrYj5wCVtQ1ErLoP9cQXQ)(tyObject_OrderedTable_O5h9b2DHiZ9as6IlqEXhDAkg* t, NimStringDesc* key, NI hc) {
+	NI result;
+	NI h;
+	NI T1_;
+	NI TM_4SoG2KRQy3oMm9aUzSLtGrA_15;
+	nimfr_("rawGetKnownHC", "tables.nim");
+{	result = (NI)0;
+	nimln_(31, "tableimpl.nim");
+	nimln_(116, "tables.nim");
+	T1_ = ((*t).data ? ((*t).data->Sup.len-1) : -1);
+	h = (NI)(hc & T1_);
+	{
+		nimln_(32, "tableimpl.nim");
+		while (1) {
+			NIM_BOOL T4_;
+			NI T11_;
+			if ((NU)(h) >= (NU)((*t).data->Sup.len)) raiseIndexError();
+			T4_ = (NIM_BOOL)0;
+			T4_ = isFilled_IxXD1UAPoEehVDW9cv9cRaew_2tables((*t).data->data[h].Field0);
+			if (!T4_) goto LA3;
+			nimln_(37, "tableimpl.nim");
+			{
+				NIM_BOOL T7_;
+				T7_ = (NIM_BOOL)0;
+				if ((NU)(h) >= (NU)((*t).data->Sup.len)) raiseIndexError();
+				T7_ = ((*t).data->data[h].Field0 == hc);
+				if (!(T7_)) goto LA8_;
+				if ((NU)(h) >= (NU)((*t).data->Sup.len)) raiseIndexError();
+				T7_ = eqStrings((*t).data->data[h].Field2, key);
+				LA8_: ;
+				if (!T7_) goto LA9_;
+				nimln_(38, "tableimpl.nim");
+				result = h;
+				goto BeforeRet_;
+			}
+			LA9_: ;
+			nimln_(39, "tableimpl.nim");
+			nimln_(116, "tables.nim");
+			T11_ = ((*t).data ? ((*t).data->Sup.len-1) : -1);
+			h = nextTry_OLPhxSyW9bte5CwHzzQVhfAtables(h, T11_);
+		} LA3: ;
+	}
+	nimln_(40, "tableimpl.nim");
+	TM_4SoG2KRQy3oMm9aUzSLtGrA_15 = subInt(((NI) -1), h);
+	result = (NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_15);
+	}BeforeRet_: ;
+	popFrame();
+	return result;
+}
+
+N_LIB_PRIVATE N_NIMCALL(void, X5BX5Deq__MFsEny7JeInf7luyFRIddw)(tyObject_OrderedTable_O5h9b2DHiZ9as6IlqEXhDAkg* t, NimStringDesc* key, tyObject_Symbol_N1BkV8GruUUMOwgDkGXgUA val) {
+	NI hc;
+	NI index;
+	nimfr_("[]=", "tables.nim");
+	hc = (NI)0;
+	nimln_(98, "tableimpl.nim");
+	index = rawGet_tcWZqY5T8nDMjS26B7Nx6g((&(*t)), key, (&hc));
+	nimln_(605, "tables.nim");
+	{
+		NimStringDesc* T5_;
+		NimStringDesc* T6_;
+		nimln_(99, "tableimpl.nim");
+		if (!(((NI) 0) <= index)) goto LA3_;
+		if ((NU)(index) >= (NU)((*t).data->Sup.len)) raiseIndexError();
+		(*t).data->data[index].Field3.idx = val.idx;
+		T5_ = (NimStringDesc*)0;
+		T5_ = (*t).data->data[index].Field3.callconv; (*t).data->data[index].Field3.callconv = copyStringRC1(val.callconv);
+		if (T5_) nimGCunrefNoCycle(T5_);
+		T6_ = (NimStringDesc*)0;
+		T6_ = (*t).data->data[index].Field3.name; (*t).data->data[index].Field3.name = copyStringRC1(val.name);
+		if (T6_) nimGCunrefNoCycle(T6_);
+	}
+	goto LA1_;
+	LA3_: ;
+	{
+		NI TM_4SoG2KRQy3oMm9aUzSLtGrA_16;
+		NI TM_4SoG2KRQy3oMm9aUzSLtGrA_17;
+		nimln_(89, "tableimpl.nim");
+		{
+			NI T10_;
+			NIM_BOOL T11_;
+			nimln_(117, "tables.nim");
+			T10_ = ((*t).data ? (*t).data->Sup.len : 0);
+			T11_ = (NIM_BOOL)0;
+			T11_ = mustRehash_CT8KHtrz1uoHrT4RgfOSmQtables(T10_, (*t).counter);
+			if (!T11_) goto LA12_;
+			nimln_(90, "tableimpl.nim");
+			enlarge_DzYTd4mIuZ9cRxhW57WEtCA(t);
+			nimln_(91, "tableimpl.nim");
+			index = rawGetKnownHC_flMrYj5wCVtQ1ErLoP9cQXQ((&(*t)), key, hc);
+		}
+		LA12_: ;
+		nimln_(92, "tableimpl.nim");
+		TM_4SoG2KRQy3oMm9aUzSLtGrA_16 = subInt(((NI) -1), index);
+		index = (NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_16);
+		nimln_(93, "tableimpl.nim");
+		rawInsert_9bWtlfrUikTbU8fl12N3WwQ(t, (&(*t).data), key, val, hc, index);
+		nimln_(94, "tableimpl.nim");
+		TM_4SoG2KRQy3oMm9aUzSLtGrA_17 = addInt((*t).counter, ((NI) 1));
+		(*t).counter = (NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_17);
+	}
+	LA1_: ;
+	popFrame();
+}
+static N_NIMCALL(void, Marker_tySequence_pUxI6Ljo6IKKHXKOZkQ7Og)(void* p, NI op) {
+	tySequence_pUxI6Ljo6IKKHXKOZkQ7Og* a;
+	NI T1_;
+	a = (tySequence_pUxI6Ljo6IKKHXKOZkQ7Og*)p;
+	T1_ = (NI)0;
+	for (T1_ = 0; T1_ < a->Sup.len; T1_++) {
+	nimGCvisit((void*)a->data[T1_].Field1, op);
+	}
+}
+
+N_LIB_PRIVATE N_NIMCALL(void, initTable_3Cf7Fyn7tUxJRodC9aUxtFw)(NI initialSize, tyObject_Table_zjMaDBasw1LnKbj11akpfw* Result) {
+	nimfr_("initTable", "tables.nim");
+	nimln_(324, "tables.nim");
+	{
+		NIM_BOOL T3_;
+		T3_ = (NIM_BOOL)0;
+		T3_ = isPowerOfTwo_M0Db9b9cHxuUgw2ZF0P8utPg(initialSize);
+		if (!!(T3_)) goto LA4_;
+		failedAssertImpl_aDmpBTs9cPuXp0Mp9cfiNeyA(((NimStringDesc*) &TM_4SoG2KRQy3oMm9aUzSLtGrA_10));
+	}
+	LA4_: ;
+	nimln_(325, "tables.nim");
+	(*Result).counter = ((NI) 0);
+	nimln_(326, "tables.nim");
+	unsureAsgnRef((void**) (&(*Result).data), (tySequence_pUxI6Ljo6IKKHXKOZkQ7Og*) newSeq((&NTI_pUxI6Ljo6IKKHXKOZkQ7Og_), ((NI)chckRange(initialSize, ((NI) 0), ((NI) IL64(9223372036854775807))))));
+	popFrame();
+}
+
+static N_INLINE(NI, rawGet_6W1ssjRyuKtSjII2c2v5RQtables)(tyObject_Table_zjMaDBasw1LnKbj11akpfw t, NimStringDesc* key, NI* hc) {
+	NI result;
+	NI h;
+	NI T5_;
+	NI TM_4SoG2KRQy3oMm9aUzSLtGrA_19;
+	nimfr_("rawGet", "tableimpl.nim");
+{	result = (NI)0;
+	nimln_(53, "tableimpl.nim");
+	(*hc) = hash_uBstFm5SYVQeOL3j9c9bc58A(key);
+	{
+		if (!((*hc) == ((NI) 0))) goto LA3_;
+		nimln_(45, "tableimpl.nim");
+		(*hc) = ((NI) 314159265);
+	}
+	LA3_: ;
+	nimln_(31, "tableimpl.nim");
+	nimln_(116, "tables.nim");
+	T5_ = (t.data ? (t.data->Sup.len-1) : -1);
+	h = (NI)((*hc) & T5_);
+	{
+		nimln_(32, "tableimpl.nim");
+		while (1) {
+			NIM_BOOL T8_;
+			NI T15_;
+			if ((NU)(h) >= (NU)(t.data->Sup.len)) raiseIndexError();
+			T8_ = (NIM_BOOL)0;
+			T8_ = isFilled_IxXD1UAPoEehVDW9cv9cRaew_2tables(t.data->data[h].Field0);
+			if (!T8_) goto LA7;
+			nimln_(37, "tableimpl.nim");
+			{
+				NIM_BOOL T11_;
+				T11_ = (NIM_BOOL)0;
+				if ((NU)(h) >= (NU)(t.data->Sup.len)) raiseIndexError();
+				T11_ = (t.data->data[h].Field0 == (*hc));
+				if (!(T11_)) goto LA12_;
+				if ((NU)(h) >= (NU)(t.data->Sup.len)) raiseIndexError();
+				T11_ = eqStrings(t.data->data[h].Field1, key);
+				LA12_: ;
+				if (!T11_) goto LA13_;
+				nimln_(38, "tableimpl.nim");
+				result = h;
+				goto BeforeRet_;
+			}
+			LA13_: ;
+			nimln_(39, "tableimpl.nim");
+			nimln_(116, "tables.nim");
+			T15_ = (t.data ? (t.data->Sup.len-1) : -1);
+			h = nextTry_OLPhxSyW9bte5CwHzzQVhfAtables(h, T15_);
+		} LA7: ;
+	}
+	nimln_(40, "tableimpl.nim");
+	TM_4SoG2KRQy3oMm9aUzSLtGrA_19 = subInt(((NI) -1), h);
+	result = (NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_19);
+	}BeforeRet_: ;
+	popFrame();
+	return result;
+}
+
 N_LIB_PRIVATE N_NIMCALL(void, rawInsert_JrnDXRCjxItwEsaMlP5tEA)(tyObject_Table_zjMaDBasw1LnKbj11akpfw* t, tySequence_pUxI6Ljo6IKKHXKOZkQ7Og** data, NimStringDesc* key, NI val, NI hc, NI h) {
 	NimStringDesc* T1_;
 	nimfr_("rawInsert", "tableimpl.nim");
@@ -684,14 +1065,14 @@ N_LIB_PRIVATE N_NIMCALL(void, rawInsert_
 N_LIB_PRIVATE N_NIMCALL(void, enlarge_NkEl9bLLrzlYTmLn9cgTZPyg)(tyObject_Table_zjMaDBasw1LnKbj11akpfw* t) {
 	tySequence_pUxI6Ljo6IKKHXKOZkQ7Og* n;
 	NI T1_;
-	NI TM_4SoG2KRQy3oMm9aUzSLtGrA_13;
+	NI TM_4SoG2KRQy3oMm9aUzSLtGrA_20;
 	tySequence_pUxI6Ljo6IKKHXKOZkQ7Og* T2_;
 	nimfr_("enlarge", "tables.nim");
 	n = (tySequence_pUxI6Ljo6IKKHXKOZkQ7Og*)0;
 	nimln_(286, "tables.nim");
 	T1_ = ((*t).data ? (*t).data->Sup.len : 0);
-	TM_4SoG2KRQy3oMm9aUzSLtGrA_13 = mulInt(T1_, ((NI) 2));
-	n = (tySequence_pUxI6Ljo6IKKHXKOZkQ7Og*) newSeq((&NTI_pUxI6Ljo6IKKHXKOZkQ7Og_), ((NI)chckRange((NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_13), ((NI) 0), ((NI) IL64(9223372036854775807)))));
+	TM_4SoG2KRQy3oMm9aUzSLtGrA_20 = mulInt(T1_, ((NI) 2));
+	n = (tySequence_pUxI6Ljo6IKKHXKOZkQ7Og*) newSeq((&NTI_pUxI6Ljo6IKKHXKOZkQ7Og_), ((NI)chckRange((NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_20), ((NI) 0), ((NI) IL64(9223372036854775807)))));
 	nimln_(287, "tables.nim");
 	T2_ = (tySequence_pUxI6Ljo6IKKHXKOZkQ7Og*)0;
 	T2_ = (*t).data;
@@ -713,7 +1094,7 @@ N_LIB_PRIVATE N_NIMCALL(void, enlarge_Nk
 			nimln_(2027, "system.nim");
 			while (1) {
 				NI eh;
-				NI TM_4SoG2KRQy3oMm9aUzSLtGrA_14;
+				NI TM_4SoG2KRQy3oMm9aUzSLtGrA_21;
 				if (!(res <= colontmp_)) goto LA6;
 				nimln_(2028, "system.nim");
 				i = res;
@@ -754,8 +1135,8 @@ N_LIB_PRIVATE N_NIMCALL(void, enlarge_Nk
 				}
 				LA10_: ;
 				nimln_(2029, "system.nim");
-				TM_4SoG2KRQy3oMm9aUzSLtGrA_14 = addInt(res, ((NI) 1));
-				res = (NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_14);
+				TM_4SoG2KRQy3oMm9aUzSLtGrA_21 = addInt(res, ((NI) 1));
+				res = (NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_21);
 			} LA6: ;
 		}
 	}
@@ -766,7 +1147,7 @@ static N_INLINE(NI, rawGetKnownHC_m6drWl
 	NI result;
 	NI h;
 	NI T1_;
-	NI TM_4SoG2KRQy3oMm9aUzSLtGrA_15;
+	NI TM_4SoG2KRQy3oMm9aUzSLtGrA_22;
 	nimfr_("rawGetKnownHC", "tableimpl.nim");
 {	result = (NI)0;
 	nimln_(31, "tableimpl.nim");
@@ -805,8 +1186,8 @@ static N_INLINE(NI, rawGetKnownHC_m6drWl
 		} LA3: ;
 	}
 	nimln_(40, "tableimpl.nim");
-	TM_4SoG2KRQy3oMm9aUzSLtGrA_15 = subInt(((NI) -1), h);
-	result = (NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_15);
+	TM_4SoG2KRQy3oMm9aUzSLtGrA_22 = subInt(((NI) -1), h);
+	result = (NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_22);
 	}BeforeRet_: ;
 	popFrame();
 	return result;
@@ -829,8 +1210,8 @@ N_LIB_PRIVATE N_NIMCALL(void, X5BX5Deq__
 	goto LA1_;
 	LA3_: ;
 	{
-		NI TM_4SoG2KRQy3oMm9aUzSLtGrA_16;
-		NI TM_4SoG2KRQy3oMm9aUzSLtGrA_17;
+		NI TM_4SoG2KRQy3oMm9aUzSLtGrA_23;
+		NI TM_4SoG2KRQy3oMm9aUzSLtGrA_24;
 		nimln_(89, "tableimpl.nim");
 		{
 			NI T8_;
@@ -847,13 +1228,13 @@ N_LIB_PRIVATE N_NIMCALL(void, X5BX5Deq__
 		}
 		LA10_: ;
 		nimln_(92, "tableimpl.nim");
-		TM_4SoG2KRQy3oMm9aUzSLtGrA_16 = subInt(((NI) -1), index);
-		index = (NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_16);
+		TM_4SoG2KRQy3oMm9aUzSLtGrA_23 = subInt(((NI) -1), index);
+		index = (NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_23);
 		nimln_(93, "tableimpl.nim");
 		rawInsert_JrnDXRCjxItwEsaMlP5tEA(t, (&(*t).data), key, val, hc, index);
 		nimln_(94, "tableimpl.nim");
-		TM_4SoG2KRQy3oMm9aUzSLtGrA_17 = addInt((*t).counter, ((NI) 1));
-		(*t).counter = (NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_17);
+		TM_4SoG2KRQy3oMm9aUzSLtGrA_24 = addInt((*t).counter, ((NI) 1));
+		(*t).counter = (NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_24);
 	}
 	LA1_: ;
 	popFrame();
@@ -985,7 +1366,7 @@ N_LIB_PRIVATE N_NIMCALL(NI*, X5BX5D__0ps
 		T6_ = (NimStringDesc*)0;
 		nimln_(170, "tables.nim");
 		T6_ = rawNewString(key->Sup.len + 15);
-appendString(T6_, ((NimStringDesc*) &TM_4SoG2KRQy3oMm9aUzSLtGrA_18));
+appendString(T6_, ((NimStringDesc*) &TM_4SoG2KRQy3oMm9aUzSLtGrA_25));
 appendString(T6_, key);
 		asgnRefNoCycle((void**) (&(*e).Sup.Sup.message), T6_);
 		nimln_(2800, "system.nim");
@@ -1040,12 +1421,12 @@ N_LIB_PRIVATE N_NIMCALL(void, del_ht2QBU
 	msk = T1_;
 	nimln_(270, "tables.nim");
 	{
-		NI TM_4SoG2KRQy3oMm9aUzSLtGrA_19;
+		NI TM_4SoG2KRQy3oMm9aUzSLtGrA_26;
 		nimln_(125, "tableimpl.nim");
 		if (!(((NI) 0) <= i)) goto LA4_;
 		nimln_(126, "tableimpl.nim");
-		TM_4SoG2KRQy3oMm9aUzSLtGrA_19 = subInt((*t).counter, ((NI) 1));
-		(*t).counter = (NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_19);
+		TM_4SoG2KRQy3oMm9aUzSLtGrA_26 = subInt((*t).counter, ((NI) 1));
+		(*t).counter = (NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_26);
 		{
 			{
 				nimln_(128, "tableimpl.nim");
@@ -1075,11 +1456,11 @@ N_LIB_PRIVATE N_NIMCALL(void, del_ht2QBU
 					{
 						nimln_(134, "tableimpl.nim");
 						while (1) {
-							NI TM_4SoG2KRQy3oMm9aUzSLtGrA_20;
+							NI TM_4SoG2KRQy3oMm9aUzSLtGrA_27;
 							nimln_(135, "tableimpl.nim");
 							nimln_(149, "tableimpl.nim");
-							TM_4SoG2KRQy3oMm9aUzSLtGrA_20 = addInt(i, ((NI) 1));
-							i = (NI)((NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_20) & msk);
+							TM_4SoG2KRQy3oMm9aUzSLtGrA_27 = addInt(i, ((NI) 1));
+							i = (NI)((NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_27) & msk);
 							nimln_(136, "tableimpl.nim");
 							{
 								NIM_BOOL T14_;
@@ -1150,36 +1531,473 @@ N_LIB_PRIVATE N_NIMCALL(void, del_ht2QBU
 	LA4_: ;
 	popFrame();
 }
+
+N_LIB_PRIVATE N_NIMCALL(NIM_BOOL, hasKey_HKT6OZnEmHzo1Z3izIwLZQ_2)(tyObject_OrderedTable_O5h9b2DHiZ9as6IlqEXhDAkg* t, NimStringDesc* key) {
+	NIM_BOOL result;
+	NI hc;
+	NI T1_;
+	nimfr_("hasKey", "tables.nim");
+	result = (NIM_BOOL)0;
+	hc = (NI)0;
+	nimln_(571, "tables.nim");
+	T1_ = (NI)0;
+	T1_ = rawGet_tcWZqY5T8nDMjS26B7Nx6g(t, key, (&hc));
+	result = (((NI) 0) <= T1_);
+	popFrame();
+	return result;
+}
+
+N_LIB_PRIVATE N_NIMCALL(NIM_BOOL, contains_HKT6OZnEmHzo1Z3izIwLZQ)(tyObject_OrderedTable_O5h9b2DHiZ9as6IlqEXhDAkg* t, NimStringDesc* key) {
+	NIM_BOOL result;
+	nimfr_("contains", "tables.nim");
+{	result = (NIM_BOOL)0;
+	nimln_(575, "tables.nim");
+	result = hasKey_HKT6OZnEmHzo1Z3izIwLZQ_2(t, key);
+	goto BeforeRet_;
+	}BeforeRet_: ;
+	popFrame();
+	return result;
+}
+static N_NIMCALL(void, Marker_tySequence_bOjjMbz7oXMD4ISKoDha4A)(void* p, NI op) {
+	tySequence_bOjjMbz7oXMD4ISKoDha4A* a;
+	NI T1_;
+	a = (tySequence_bOjjMbz7oXMD4ISKoDha4A*)p;
+	T1_ = (NI)0;
+	for (T1_ = 0; T1_ < a->Sup.len; T1_++) {
+	nimGCvisit((void*)a->data[T1_].Field1, op);
+	}
+}
+
+N_LIB_PRIVATE N_NIMCALL(void, initTable_zV5oU6FeS1GaZMwcoDufeg)(NI initialSize, tyObject_Table_PACZxzsw3jicSea9ai2ghqw* Result) {
+	nimfr_("initTable", "tables.nim");
+	nimln_(324, "tables.nim");
+	{
+		NIM_BOOL T3_;
+		T3_ = (NIM_BOOL)0;
+		T3_ = isPowerOfTwo_M0Db9b9cHxuUgw2ZF0P8utPg(initialSize);
+		if (!!(T3_)) goto LA4_;
+		failedAssertImpl_aDmpBTs9cPuXp0Mp9cfiNeyA(((NimStringDesc*) &TM_4SoG2KRQy3oMm9aUzSLtGrA_10));
+	}
+	LA4_: ;
+	nimln_(325, "tables.nim");
+	(*Result).counter = ((NI) 0);
+	nimln_(326, "tables.nim");
+	unsureAsgnRef((void**) (&(*Result).data), (tySequence_bOjjMbz7oXMD4ISKoDha4A*) newSeq((&NTI_bOjjMbz7oXMD4ISKoDha4A_), ((NI)chckRange(initialSize, ((NI) 0), ((NI) IL64(9223372036854775807))))));
+	popFrame();
+}
+
+static N_INLINE(NI, rawGet_SBkxAH9ca7KOhVtJSmwaYeAtables)(tyObject_Table_PACZxzsw3jicSea9ai2ghqw t, NimStringDesc* key, NI* hc) {
+	NI result;
+	NI h;
+	NI T5_;
+	NI TM_4SoG2KRQy3oMm9aUzSLtGrA_31;
+	nimfr_("rawGet", "tableimpl.nim");
+{	result = (NI)0;
+	nimln_(53, "tableimpl.nim");
+	(*hc) = hash_uBstFm5SYVQeOL3j9c9bc58A(key);
+	{
+		if (!((*hc) == ((NI) 0))) goto LA3_;
+		nimln_(45, "tableimpl.nim");
+		(*hc) = ((NI) 314159265);
+	}
+	LA3_: ;
+	nimln_(31, "tableimpl.nim");
+	nimln_(116, "tables.nim");
+	T5_ = (t.data ? (t.data->Sup.len-1) : -1);
+	h = (NI)((*hc) & T5_);
+	{
+		nimln_(32, "tableimpl.nim");
+		while (1) {
+			NIM_BOOL T8_;
+			NI T15_;
+			if ((NU)(h) >= (NU)(t.data->Sup.len)) raiseIndexError();
+			T8_ = (NIM_BOOL)0;
+			T8_ = isFilled_IxXD1UAPoEehVDW9cv9cRaew_2tables(t.data->data[h].Field0);
+			if (!T8_) goto LA7;
+			nimln_(37, "tableimpl.nim");
+			{
+				NIM_BOOL T11_;
+				T11_ = (NIM_BOOL)0;
+				if ((NU)(h) >= (NU)(t.data->Sup.len)) raiseIndexError();
+				T11_ = (t.data->data[h].Field0 == (*hc));
+				if (!(T11_)) goto LA12_;
+				if ((NU)(h) >= (NU)(t.data->Sup.len)) raiseIndexError();
+				T11_ = eqStrings(t.data->data[h].Field1, key);
+				LA12_: ;
+				if (!T11_) goto LA13_;
+				nimln_(38, "tableimpl.nim");
+				result = h;
+				goto BeforeRet_;
+			}
+			LA13_: ;
+			nimln_(39, "tableimpl.nim");
+			nimln_(116, "tables.nim");
+			T15_ = (t.data ? (t.data->Sup.len-1) : -1);
+			h = nextTry_OLPhxSyW9bte5CwHzzQVhfAtables(h, T15_);
+		} LA7: ;
+	}
+	nimln_(40, "tableimpl.nim");
+	TM_4SoG2KRQy3oMm9aUzSLtGrA_31 = subInt(((NI) -1), h);
+	result = (NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_31);
+	}BeforeRet_: ;
+	popFrame();
+	return result;
+}
+
+N_LIB_PRIVATE N_NIMCALL(void, rawInsert_8XE6Bccm5rgvZG69aoI89coA)(tyObject_Table_PACZxzsw3jicSea9ai2ghqw* t, tySequence_bOjjMbz7oXMD4ISKoDha4A** data, NimStringDesc* key, tyTuple_pfrdooyxJsC6cg34ebuBag val, NI hc, NI h) {
+	NimStringDesc* T1_;
+	nimfr_("rawInsert", "tableimpl.nim");
+	if ((NU)(h) >= (NU)((*data)->Sup.len)) raiseIndexError();
+	nimln_(64, "tableimpl.nim");
+	T1_ = (NimStringDesc*)0;
+	T1_ = (*data)->data[h].Field1; (*data)->data[h].Field1 = copyStringRC1(key);
+	if (T1_) nimGCunrefNoCycle(T1_);
+	if ((NU)(h) >= (NU)((*data)->Sup.len)) raiseIndexError();
+	nimln_(65, "tableimpl.nim");
+	(*data)->data[h].Field2 = val;
+	if ((NU)(h) >= (NU)((*data)->Sup.len)) raiseIndexError();
+	nimln_(66, "tableimpl.nim");
+	(*data)->data[h].Field0 = hc;
+	popFrame();
+}
+
+N_LIB_PRIVATE N_NIMCALL(void, enlarge_9aDeslpuX9c9bJ0do8WXpQ2ow)(tyObject_Table_PACZxzsw3jicSea9ai2ghqw* t) {
+	tySequence_bOjjMbz7oXMD4ISKoDha4A* n;
+	NI T1_;
+	NI TM_4SoG2KRQy3oMm9aUzSLtGrA_32;
+	tySequence_bOjjMbz7oXMD4ISKoDha4A* T2_;
+	nimfr_("enlarge", "tables.nim");
+	n = (tySequence_bOjjMbz7oXMD4ISKoDha4A*)0;
+	nimln_(286, "tables.nim");
+	T1_ = ((*t).data ? (*t).data->Sup.len : 0);
+	TM_4SoG2KRQy3oMm9aUzSLtGrA_32 = mulInt(T1_, ((NI) 2));
+	n = (tySequence_bOjjMbz7oXMD4ISKoDha4A*) newSeq((&NTI_bOjjMbz7oXMD4ISKoDha4A_), ((NI)chckRange((NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_32), ((NI) 0), ((NI) IL64(9223372036854775807)))));
+	nimln_(287, "tables.nim");
+	T2_ = (tySequence_bOjjMbz7oXMD4ISKoDha4A*)0;
+	T2_ = (*t).data;
+	unsureAsgnRef((void**) (&(*t).data), n);
+	n = T2_;
+	{
+		NI i;
+		NI colontmp_;
+		NI T4_;
+		NI res;
+		i = (NI)0;
+		colontmp_ = (NI)0;
+		nimln_(288, "tables.nim");
+		T4_ = (n ? (n->Sup.len-1) : -1);
+		colontmp_ = T4_;
+		nimln_(2026, "system.nim");
+		res = ((NI) 0);
+		{
+			nimln_(2027, "system.nim");
+			while (1) {
+				NI eh;
+				NI TM_4SoG2KRQy3oMm9aUzSLtGrA_33;
+				if (!(res <= colontmp_)) goto LA6;
+				nimln_(2028, "system.nim");
+				i = res;
+				nimln_(289, "tables.nim");
+				if ((NU)(i) >= (NU)(n->Sup.len)) raiseIndexError();
+				eh = n->data[i].Field0;
+				nimln_(290, "tables.nim");
+				{
+					NIM_BOOL T9_;
+					NI j;
+					NI T12_;
+					T9_ = (NIM_BOOL)0;
+					T9_ = isFilled_IxXD1UAPoEehVDW9cv9cRaew_2tables(eh);
+					if (!T9_) goto LA10_;
+					nimln_(291, "tables.nim");
+					nimln_(116, "tables.nim");
+					T12_ = ((*t).data ? ((*t).data->Sup.len-1) : -1);
+					j = (NI)(eh & T12_);
+					{
+						nimln_(292, "tables.nim");
+						while (1) {
+							NIM_BOOL T15_;
+							NI T16_;
+							if ((NU)(j) >= (NU)((*t).data->Sup.len)) raiseIndexError();
+							T15_ = (NIM_BOOL)0;
+							T15_ = isFilled_IxXD1UAPoEehVDW9cv9cRaew_2tables((*t).data->data[j].Field0);
+							if (!T15_) goto LA14;
+							nimln_(293, "tables.nim");
+							nimln_(116, "tables.nim");
+							T16_ = ((*t).data ? ((*t).data->Sup.len-1) : -1);
+							j = nextTry_OLPhxSyW9bte5CwHzzQVhfAtables(j, T16_);
+						} LA14: ;
+					}
+					nimln_(294, "tables.nim");
+					if ((NU)(i) >= (NU)(n->Sup.len)) raiseIndexError();
+					if ((NU)(i) >= (NU)(n->Sup.len)) raiseIndexError();
+					rawInsert_8XE6Bccm5rgvZG69aoI89coA(t, (&(*t).data), n->data[i].Field1, n->data[i].Field2, eh, j);
+				}
+				LA10_: ;
+				nimln_(2029, "system.nim");
+				TM_4SoG2KRQy3oMm9aUzSLtGrA_33 = addInt(res, ((NI) 1));
+				res = (NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_33);
+			} LA6: ;
+		}
+	}
+	popFrame();
+}
+
+static N_INLINE(NI, rawGetKnownHC_9aLLajLZ9cxLdcfp84DFJ8tQtables)(tyObject_Table_PACZxzsw3jicSea9ai2ghqw t, NimStringDesc* key, NI hc) {
+	NI result;
+	NI h;
+	NI T1_;
+	NI TM_4SoG2KRQy3oMm9aUzSLtGrA_34;
+	nimfr_("rawGetKnownHC", "tableimpl.nim");
+{	result = (NI)0;
+	nimln_(31, "tableimpl.nim");
+	nimln_(116, "tables.nim");
+	T1_ = (t.data ? (t.data->Sup.len-1) : -1);
+	h = (NI)(hc & T1_);
+	{
+		nimln_(32, "tableimpl.nim");
+		while (1) {
+			NIM_BOOL T4_;
+			NI T11_;
+			if ((NU)(h) >= (NU)(t.data->Sup.len)) raiseIndexError();
+			T4_ = (NIM_BOOL)0;
+			T4_ = isFilled_IxXD1UAPoEehVDW9cv9cRaew_2tables(t.data->data[h].Field0);
+			if (!T4_) goto LA3;
+			nimln_(37, "tableimpl.nim");
+			{
+				NIM_BOOL T7_;
+				T7_ = (NIM_BOOL)0;
+				if ((NU)(h) >= (NU)(t.data->Sup.len)) raiseIndexError();
+				T7_ = (t.data->data[h].Field0 == hc);
+				if (!(T7_)) goto LA8_;
+				if ((NU)(h) >= (NU)(t.data->Sup.len)) raiseIndexError();
+				T7_ = eqStrings(t.data->data[h].Field1, key);
+				LA8_: ;
+				if (!T7_) goto LA9_;
+				nimln_(38, "tableimpl.nim");
+				result = h;
+				goto BeforeRet_;
+			}
+			LA9_: ;
+			nimln_(39, "tableimpl.nim");
+			nimln_(116, "tables.nim");
+			T11_ = (t.data ? (t.data->Sup.len-1) : -1);
+			h = nextTry_OLPhxSyW9bte5CwHzzQVhfAtables(h, T11_);
+		} LA3: ;
+	}
+	nimln_(40, "tableimpl.nim");
+	TM_4SoG2KRQy3oMm9aUzSLtGrA_34 = subInt(((NI) -1), h);
+	result = (NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_34);
+	}BeforeRet_: ;
+	popFrame();
+	return result;
+}
+
+N_LIB_PRIVATE N_NIMCALL(void, X5BX5Deq__B8MciEVBahlJqgunXtrlVg)(tyObject_Table_PACZxzsw3jicSea9ai2ghqw* t, NimStringDesc* key, tyTuple_pfrdooyxJsC6cg34ebuBag val) {
+	NI hc;
+	NI index;
+	nimfr_("[]=", "tables.nim");
+	hc = (NI)0;
+	nimln_(98, "tableimpl.nim");
+	index = rawGet_SBkxAH9ca7KOhVtJSmwaYeAtables((*t), key, (&hc));
+	nimln_(307, "tables.nim");
+	{
+		nimln_(99, "tableimpl.nim");
+		if (!(((NI) 0) <= index)) goto LA3_;
+		if ((NU)(index) >= (NU)((*t).data->Sup.len)) raiseIndexError();
+		(*t).data->data[index].Field2 = val;
+	}
+	goto LA1_;
+	LA3_: ;
+	{
+		NI TM_4SoG2KRQy3oMm9aUzSLtGrA_35;
+		NI TM_4SoG2KRQy3oMm9aUzSLtGrA_36;
+		nimln_(89, "tableimpl.nim");
+		{
+			NI T8_;
+			NIM_BOOL T9_;
+			nimln_(117, "tables.nim");
+			T8_ = ((*t).data ? (*t).data->Sup.len : 0);
+			T9_ = (NIM_BOOL)0;
+			T9_ = mustRehash_CT8KHtrz1uoHrT4RgfOSmQtables(T8_, (*t).counter);
+			if (!T9_) goto LA10_;
+			nimln_(90, "tableimpl.nim");
+			enlarge_9aDeslpuX9c9bJ0do8WXpQ2ow(t);
+			nimln_(91, "tableimpl.nim");
+			index = rawGetKnownHC_9aLLajLZ9cxLdcfp84DFJ8tQtables((*t), key, hc);
+		}
+		LA10_: ;
+		nimln_(92, "tableimpl.nim");
+		TM_4SoG2KRQy3oMm9aUzSLtGrA_35 = subInt(((NI) -1), index);
+		index = (NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_35);
+		nimln_(93, "tableimpl.nim");
+		rawInsert_8XE6Bccm5rgvZG69aoI89coA(t, (&(*t).data), key, val, hc, index);
+		nimln_(94, "tableimpl.nim");
+		TM_4SoG2KRQy3oMm9aUzSLtGrA_36 = addInt((*t).counter, ((NI) 1));
+		(*t).counter = (NI)(TM_4SoG2KRQy3oMm9aUzSLtGrA_36);
+	}
+	LA1_: ;
+	popFrame();
+}
+
+N_LIB_PRIVATE N_NIMCALL(NIM_BOOL, hasKey_Oi9bcvMPJyGzGx7X1KepzhA_2)(tyObject_Table_PACZxzsw3jicSea9ai2ghqw t, NimStringDesc* key) {
+	NIM_BOOL result;
+	NI hc;
+	NI T1_;
+	nimfr_("hasKey", "tables.nim");
+	result = (NIM_BOOL)0;
+	hc = (NI)0;
+	nimln_(236, "tables.nim");
+	T1_ = (NI)0;
+	T1_ = rawGet_SBkxAH9ca7KOhVtJSmwaYeAtables(t, key, (&hc));
+	result = (((NI) 0) <= T1_);
+	popFrame();
+	return result;
+}
+
+N_LIB_PRIVATE N_NIMCALL(NIM_BOOL, contains_Oi9bcvMPJyGzGx7X1KepzhA)(tyObject_Table_PACZxzsw3jicSea9ai2ghqw t, NimStringDesc* key) {
+	NIM_BOOL result;
+	nimfr_("contains", "tables.nim");
+{	result = (NIM_BOOL)0;
+	nimln_(240, "tables.nim");
+	result = hasKey_Oi9bcvMPJyGzGx7X1KepzhA_2(t, key);
+	goto BeforeRet_;
+	}BeforeRet_: ;
+	popFrame();
+	return result;
+}
+
+N_LIB_PRIVATE N_NIMCALL(tyTuple_pfrdooyxJsC6cg34ebuBag*, X5BX5D__reB9awySmHmXRCQNcbeZdSA)(tyObject_Table_PACZxzsw3jicSea9ai2ghqw* t, NimStringDesc* key) {
+	tyTuple_pfrdooyxJsC6cg34ebuBag* result;
+	NI hc;
+	NI index;
+	nimfr_("[]", "tables.nim");
+	result = (tyTuple_pfrdooyxJsC6cg34ebuBag*)0;
+	hc = (NI)0;
+	nimln_(147, "tables.nim");
+	index = rawGet_SBkxAH9ca7KOhVtJSmwaYeAtables((*t), key, (&hc));
+	nimln_(170, "tables.nim");
+	{
+		nimln_(148, "tables.nim");
+		if (!(((NI) 0) <= index)) goto LA3_;
+		if ((NU)(index) >= (NU)((*t).data->Sup.len)) raiseIndexError();
+		result = (&(*t).data->data[index].Field2);
+	}
+	goto LA1_;
+	LA3_: ;
+	{
+		tyObject_KeyError_ifYAhUumNzWR9c9cN9amyJLtg* e;
+		NimStringDesc* T6_;
+		e = (tyObject_KeyError_ifYAhUumNzWR9c9cN9amyJLtg*)0;
+		nimln_(2805, "system.nim");
+		e = (tyObject_KeyError_ifYAhUumNzWR9c9cN9amyJLtg*) newObj((&NTI_axqhRnwd09cVJkRcojfw6mA_), sizeof(tyObject_KeyError_ifYAhUumNzWR9c9cN9amyJLtg));
+		(*e).Sup.Sup.Sup.m_type = (&NTI_ifYAhUumNzWR9c9cN9amyJLtg_);
+		nimln_(151, "tables.nim");
+		T6_ = (NimStringDesc*)0;
+		nimln_(170, "tables.nim");
+		T6_ = rawNewString(key->Sup.len + 15);
+appendString(T6_, ((NimStringDesc*) &TM_4SoG2KRQy3oMm9aUzSLtGrA_25));
+appendString(T6_, key);
+		asgnRefNoCycle((void**) (&(*e).Sup.Sup.message), T6_);
+		nimln_(2800, "system.nim");
+		asgnRef((void**) (&(*e).Sup.Sup.parent), NIM_NIL);
+		nimln_(151, "tables.nim");
+		raiseException((Exception*)e, "KeyError");
+	}
+	LA1_: ;
+	popFrame();
+	return result;
+}
 NIM_EXTERNC N_NOINLINE(void, stdlib_tablesInit000)(void) {
 	nimfr_("tables", "tables.nim");
 	popFrame();
 }
 
 NIM_EXTERNC N_NOINLINE(void, stdlib_tablesDatInit000)(void) {
-static TNimNode* TM_4SoG2KRQy3oMm9aUzSLtGrA_11[3];
-static TNimNode* TM_4SoG2KRQy3oMm9aUzSLtGrA_21[2];
-static TNimNode TM_4SoG2KRQy3oMm9aUzSLtGrA_0[7];
-NTI_sr3s7uVHpu9cEbbDnCSg8yQ_.size = sizeof(tyTuple_sr3s7uVHpu9cEbbDnCSg8yQ);
-NTI_sr3s7uVHpu9cEbbDnCSg8yQ_.kind = 18;
-NTI_sr3s7uVHpu9cEbbDnCSg8yQ_.base = 0;
-NTI_sr3s7uVHpu9cEbbDnCSg8yQ_.flags = 2;
+static TNimNode* TM_4SoG2KRQy3oMm9aUzSLtGrA_11[4];
+static TNimNode* TM_4SoG2KRQy3oMm9aUzSLtGrA_12[4];
+static TNimNode* TM_4SoG2KRQy3oMm9aUzSLtGrA_18[3];
+static TNimNode* TM_4SoG2KRQy3oMm9aUzSLtGrA_28[2];
+static TNimNode* TM_4SoG2KRQy3oMm9aUzSLtGrA_29[2];
+static TNimNode* TM_4SoG2KRQy3oMm9aUzSLtGrA_30[3];
+static TNimNode TM_4SoG2KRQy3oMm9aUzSLtGrA_0[24];
+NTI_Es9aMzZJysXteLK5qQXSB6A_.size = sizeof(tyTuple_Es9aMzZJysXteLK5qQXSB6A);
+NTI_Es9aMzZJysXteLK5qQXSB6A_.kind = 18;
+NTI_Es9aMzZJysXteLK5qQXSB6A_.base = 0;
+NTI_Es9aMzZJysXteLK5qQXSB6A_.flags = 2;
 TM_4SoG2KRQy3oMm9aUzSLtGrA_11[0] = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[1];
 TM_4SoG2KRQy3oMm9aUzSLtGrA_0[1].kind = 1;
-TM_4SoG2KRQy3oMm9aUzSLtGrA_0[1].offset = offsetof(tyTuple_sr3s7uVHpu9cEbbDnCSg8yQ, Field0);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[1].offset = offsetof(tyTuple_Es9aMzZJysXteLK5qQXSB6A, Field0);
 TM_4SoG2KRQy3oMm9aUzSLtGrA_0[1].typ = (&NTI_rR5Bzr1D5krxoo1NcNyeMA_);
 TM_4SoG2KRQy3oMm9aUzSLtGrA_0[1].name = "Field0";
 TM_4SoG2KRQy3oMm9aUzSLtGrA_11[1] = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[2];
 TM_4SoG2KRQy3oMm9aUzSLtGrA_0[2].kind = 1;
-TM_4SoG2KRQy3oMm9aUzSLtGrA_0[2].offset = offsetof(tyTuple_sr3s7uVHpu9cEbbDnCSg8yQ, Field1);
-TM_4SoG2KRQy3oMm9aUzSLtGrA_0[2].typ = (&NTI_77mFvmsOLKik79ci2hXkHEg_);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[2].offset = offsetof(tyTuple_Es9aMzZJysXteLK5qQXSB6A, Field1);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[2].typ = (&NTI_rR5Bzr1D5krxoo1NcNyeMA_);
 TM_4SoG2KRQy3oMm9aUzSLtGrA_0[2].name = "Field1";
 TM_4SoG2KRQy3oMm9aUzSLtGrA_11[2] = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[3];
 TM_4SoG2KRQy3oMm9aUzSLtGrA_0[3].kind = 1;
-TM_4SoG2KRQy3oMm9aUzSLtGrA_0[3].offset = offsetof(tyTuple_sr3s7uVHpu9cEbbDnCSg8yQ, Field2);
-TM_4SoG2KRQy3oMm9aUzSLtGrA_0[3].typ = (&NTI_rR5Bzr1D5krxoo1NcNyeMA_);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[3].offset = offsetof(tyTuple_Es9aMzZJysXteLK5qQXSB6A, Field2);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[3].typ = (&NTI_77mFvmsOLKik79ci2hXkHEg_);
 TM_4SoG2KRQy3oMm9aUzSLtGrA_0[3].name = "Field2";
-TM_4SoG2KRQy3oMm9aUzSLtGrA_0[0].len = 3; TM_4SoG2KRQy3oMm9aUzSLtGrA_0[0].kind = 2; TM_4SoG2KRQy3oMm9aUzSLtGrA_0[0].sons = &TM_4SoG2KRQy3oMm9aUzSLtGrA_11[0];
-NTI_sr3s7uVHpu9cEbbDnCSg8yQ_.node = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[0];
+TM_4SoG2KRQy3oMm9aUzSLtGrA_11[3] = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[4];
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[4].kind = 1;
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[4].offset = offsetof(tyTuple_Es9aMzZJysXteLK5qQXSB6A, Field3);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[4].typ = (&NTI_N1BkV8GruUUMOwgDkGXgUA_);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[4].name = "Field3";
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[0].len = 4; TM_4SoG2KRQy3oMm9aUzSLtGrA_0[0].kind = 2; TM_4SoG2KRQy3oMm9aUzSLtGrA_0[0].sons = &TM_4SoG2KRQy3oMm9aUzSLtGrA_11[0];
+NTI_Es9aMzZJysXteLK5qQXSB6A_.node = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[0];
+NTI_P9aLWDkBxPmAKZ1JjVQHqMQ_.size = sizeof(tySequence_P9aLWDkBxPmAKZ1JjVQHqMQ*);
+NTI_P9aLWDkBxPmAKZ1JjVQHqMQ_.kind = 24;
+NTI_P9aLWDkBxPmAKZ1JjVQHqMQ_.base = (&NTI_Es9aMzZJysXteLK5qQXSB6A_);
+NTI_P9aLWDkBxPmAKZ1JjVQHqMQ_.flags = 2;
+NTI_P9aLWDkBxPmAKZ1JjVQHqMQ_.marker = Marker_tySequence_P9aLWDkBxPmAKZ1JjVQHqMQ;
+NTI_O5h9b2DHiZ9as6IlqEXhDAkg_.size = sizeof(tyObject_OrderedTable_O5h9b2DHiZ9as6IlqEXhDAkg);
+NTI_O5h9b2DHiZ9as6IlqEXhDAkg_.kind = 18;
+NTI_O5h9b2DHiZ9as6IlqEXhDAkg_.base = 0;
+NTI_O5h9b2DHiZ9as6IlqEXhDAkg_.flags = 2;
+TM_4SoG2KRQy3oMm9aUzSLtGrA_12[0] = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[6];
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[6].kind = 1;
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[6].offset = offsetof(tyObject_OrderedTable_O5h9b2DHiZ9as6IlqEXhDAkg, data);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[6].typ = (&NTI_P9aLWDkBxPmAKZ1JjVQHqMQ_);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[6].name = "data";
+TM_4SoG2KRQy3oMm9aUzSLtGrA_12[1] = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[7];
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[7].kind = 1;
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[7].offset = offsetof(tyObject_OrderedTable_O5h9b2DHiZ9as6IlqEXhDAkg, counter);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[7].typ = (&NTI_rR5Bzr1D5krxoo1NcNyeMA_);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[7].name = "counter";
+TM_4SoG2KRQy3oMm9aUzSLtGrA_12[2] = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[8];
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[8].kind = 1;
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[8].offset = offsetof(tyObject_OrderedTable_O5h9b2DHiZ9as6IlqEXhDAkg, first);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[8].typ = (&NTI_rR5Bzr1D5krxoo1NcNyeMA_);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[8].name = "first";
+TM_4SoG2KRQy3oMm9aUzSLtGrA_12[3] = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[9];
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[9].kind = 1;
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[9].offset = offsetof(tyObject_OrderedTable_O5h9b2DHiZ9as6IlqEXhDAkg, last);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[9].typ = (&NTI_rR5Bzr1D5krxoo1NcNyeMA_);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[9].name = "last";
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[5].len = 4; TM_4SoG2KRQy3oMm9aUzSLtGrA_0[5].kind = 2; TM_4SoG2KRQy3oMm9aUzSLtGrA_0[5].sons = &TM_4SoG2KRQy3oMm9aUzSLtGrA_12[0];
+NTI_O5h9b2DHiZ9as6IlqEXhDAkg_.node = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[5];
+NTI_sr3s7uVHpu9cEbbDnCSg8yQ_.size = sizeof(tyTuple_sr3s7uVHpu9cEbbDnCSg8yQ);
+NTI_sr3s7uVHpu9cEbbDnCSg8yQ_.kind = 18;
+NTI_sr3s7uVHpu9cEbbDnCSg8yQ_.base = 0;
+NTI_sr3s7uVHpu9cEbbDnCSg8yQ_.flags = 2;
+TM_4SoG2KRQy3oMm9aUzSLtGrA_18[0] = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[11];
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[11].kind = 1;
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[11].offset = offsetof(tyTuple_sr3s7uVHpu9cEbbDnCSg8yQ, Field0);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[11].typ = (&NTI_rR5Bzr1D5krxoo1NcNyeMA_);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[11].name = "Field0";
+TM_4SoG2KRQy3oMm9aUzSLtGrA_18[1] = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[12];
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[12].kind = 1;
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[12].offset = offsetof(tyTuple_sr3s7uVHpu9cEbbDnCSg8yQ, Field1);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[12].typ = (&NTI_77mFvmsOLKik79ci2hXkHEg_);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[12].name = "Field1";
+TM_4SoG2KRQy3oMm9aUzSLtGrA_18[2] = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[13];
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[13].kind = 1;
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[13].offset = offsetof(tyTuple_sr3s7uVHpu9cEbbDnCSg8yQ, Field2);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[13].typ = (&NTI_rR5Bzr1D5krxoo1NcNyeMA_);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[13].name = "Field2";
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[10].len = 3; TM_4SoG2KRQy3oMm9aUzSLtGrA_0[10].kind = 2; TM_4SoG2KRQy3oMm9aUzSLtGrA_0[10].sons = &TM_4SoG2KRQy3oMm9aUzSLtGrA_18[0];
+NTI_sr3s7uVHpu9cEbbDnCSg8yQ_.node = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[10];
 NTI_pUxI6Ljo6IKKHXKOZkQ7Og_.size = sizeof(tySequence_pUxI6Ljo6IKKHXKOZkQ7Og*);
 NTI_pUxI6Ljo6IKKHXKOZkQ7Og_.kind = 24;
 NTI_pUxI6Ljo6IKKHXKOZkQ7Og_.base = (&NTI_sr3s7uVHpu9cEbbDnCSg8yQ_);
@@ -1189,17 +2007,59 @@ NTI_zjMaDBasw1LnKbj11akpfw_.size = sizeo
 NTI_zjMaDBasw1LnKbj11akpfw_.kind = 18;
 NTI_zjMaDBasw1LnKbj11akpfw_.base = 0;
 NTI_zjMaDBasw1LnKbj11akpfw_.flags = 2;
-TM_4SoG2KRQy3oMm9aUzSLtGrA_21[0] = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[5];
-TM_4SoG2KRQy3oMm9aUzSLtGrA_0[5].kind = 1;
-TM_4SoG2KRQy3oMm9aUzSLtGrA_0[5].offset = offsetof(tyObject_Table_zjMaDBasw1LnKbj11akpfw, data);
-TM_4SoG2KRQy3oMm9aUzSLtGrA_0[5].typ = (&NTI_pUxI6Ljo6IKKHXKOZkQ7Og_);
-TM_4SoG2KRQy3oMm9aUzSLtGrA_0[5].name = "data";
-TM_4SoG2KRQy3oMm9aUzSLtGrA_21[1] = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[6];
-TM_4SoG2KRQy3oMm9aUzSLtGrA_0[6].kind = 1;
-TM_4SoG2KRQy3oMm9aUzSLtGrA_0[6].offset = offsetof(tyObject_Table_zjMaDBasw1LnKbj11akpfw, counter);
-TM_4SoG2KRQy3oMm9aUzSLtGrA_0[6].typ = (&NTI_rR5Bzr1D5krxoo1NcNyeMA_);
-TM_4SoG2KRQy3oMm9aUzSLtGrA_0[6].name = "counter";
-TM_4SoG2KRQy3oMm9aUzSLtGrA_0[4].len = 2; TM_4SoG2KRQy3oMm9aUzSLtGrA_0[4].kind = 2; TM_4SoG2KRQy3oMm9aUzSLtGrA_0[4].sons = &TM_4SoG2KRQy3oMm9aUzSLtGrA_21[0];
-NTI_zjMaDBasw1LnKbj11akpfw_.node = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[4];
+TM_4SoG2KRQy3oMm9aUzSLtGrA_28[0] = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[15];
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[15].kind = 1;
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[15].offset = offsetof(tyObject_Table_zjMaDBasw1LnKbj11akpfw, data);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[15].typ = (&NTI_pUxI6Ljo6IKKHXKOZkQ7Og_);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[15].name = "data";
+TM_4SoG2KRQy3oMm9aUzSLtGrA_28[1] = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[16];
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[16].kind = 1;
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[16].offset = offsetof(tyObject_Table_zjMaDBasw1LnKbj11akpfw, counter);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[16].typ = (&NTI_rR5Bzr1D5krxoo1NcNyeMA_);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[16].name = "counter";
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[14].len = 2; TM_4SoG2KRQy3oMm9aUzSLtGrA_0[14].kind = 2; TM_4SoG2KRQy3oMm9aUzSLtGrA_0[14].sons = &TM_4SoG2KRQy3oMm9aUzSLtGrA_28[0];
+NTI_zjMaDBasw1LnKbj11akpfw_.node = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[14];
+NTI_PACZxzsw3jicSea9ai2ghqw_.size = sizeof(tyObject_Table_PACZxzsw3jicSea9ai2ghqw);
+NTI_PACZxzsw3jicSea9ai2ghqw_.kind = 18;
+NTI_PACZxzsw3jicSea9ai2ghqw_.base = 0;
+NTI_PACZxzsw3jicSea9ai2ghqw_.flags = 2;
+TM_4SoG2KRQy3oMm9aUzSLtGrA_29[0] = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[18];
+NTI_2FVElvR0r3KpHu9aezPjm5w_.size = sizeof(tyTuple_2FVElvR0r3KpHu9aezPjm5w);
+NTI_2FVElvR0r3KpHu9aezPjm5w_.kind = 18;
+NTI_2FVElvR0r3KpHu9aezPjm5w_.base = 0;
+NTI_2FVElvR0r3KpHu9aezPjm5w_.flags = 2;
+TM_4SoG2KRQy3oMm9aUzSLtGrA_30[0] = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[20];
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[20].kind = 1;
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[20].offset = offsetof(tyTuple_2FVElvR0r3KpHu9aezPjm5w, Field0);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[20].typ = (&NTI_rR5Bzr1D5krxoo1NcNyeMA_);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[20].name = "Field0";
+TM_4SoG2KRQy3oMm9aUzSLtGrA_30[1] = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[21];
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[21].kind = 1;
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[21].offset = offsetof(tyTuple_2FVElvR0r3KpHu9aezPjm5w, Field1);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[21].typ = (&NTI_77mFvmsOLKik79ci2hXkHEg_);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[21].name = "Field1";
+TM_4SoG2KRQy3oMm9aUzSLtGrA_30[2] = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[22];
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[22].kind = 1;
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[22].offset = offsetof(tyTuple_2FVElvR0r3KpHu9aezPjm5w, Field2);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[22].typ = (&NTI_pfrdooyxJsC6cg34ebuBag_);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[22].name = "Field2";
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[19].len = 3; TM_4SoG2KRQy3oMm9aUzSLtGrA_0[19].kind = 2; TM_4SoG2KRQy3oMm9aUzSLtGrA_0[19].sons = &TM_4SoG2KRQy3oMm9aUzSLtGrA_30[0];
+NTI_2FVElvR0r3KpHu9aezPjm5w_.node = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[19];
+NTI_bOjjMbz7oXMD4ISKoDha4A_.size = sizeof(tySequence_bOjjMbz7oXMD4ISKoDha4A*);
+NTI_bOjjMbz7oXMD4ISKoDha4A_.kind = 24;
+NTI_bOjjMbz7oXMD4ISKoDha4A_.base = (&NTI_2FVElvR0r3KpHu9aezPjm5w_);
+NTI_bOjjMbz7oXMD4ISKoDha4A_.flags = 2;
+NTI_bOjjMbz7oXMD4ISKoDha4A_.marker = Marker_tySequence_bOjjMbz7oXMD4ISKoDha4A;
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[18].kind = 1;
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[18].offset = offsetof(tyObject_Table_PACZxzsw3jicSea9ai2ghqw, data);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[18].typ = (&NTI_bOjjMbz7oXMD4ISKoDha4A_);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[18].name = "data";
+TM_4SoG2KRQy3oMm9aUzSLtGrA_29[1] = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[23];
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[23].kind = 1;
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[23].offset = offsetof(tyObject_Table_PACZxzsw3jicSea9ai2ghqw, counter);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[23].typ = (&NTI_rR5Bzr1D5krxoo1NcNyeMA_);
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[23].name = "counter";
+TM_4SoG2KRQy3oMm9aUzSLtGrA_0[17].len = 2; TM_4SoG2KRQy3oMm9aUzSLtGrA_0[17].kind = 2; TM_4SoG2KRQy3oMm9aUzSLtGrA_0[17].sons = &TM_4SoG2KRQy3oMm9aUzSLtGrA_29[0];
+NTI_PACZxzsw3jicSea9ai2ghqw_.node = &TM_4SoG2KRQy3oMm9aUzSLtGrA_0[17];
 }