From 03d6876f2aec9e75e021142769b8e3497dce0969 Mon Sep 17 00:00:00 2001
From: rusefi <rusefillc@gmail.com>
Date: Wed, 19 Dec 2018 23:35:45 -0500
Subject: [PATCH] refactoring

---
 java_tools/ConfigDefinition.jar               | Bin 33793 -> 35055 bytes
 .../src/com/rusefi/ConfigDefinition.java      |  44 +++++++++---------
 .../src/com/rusefi/ReaderState.java           |  16 +++++++
 3 files changed, 37 insertions(+), 23 deletions(-)
 create mode 100644 java_tools/configuration_definition/src/com/rusefi/ReaderState.java

diff --git a/java_tools/ConfigDefinition.jar b/java_tools/ConfigDefinition.jar
index 474227e9d2075c727f8dd4b1119b670f574b161b..d74f194ca1f7804a325ec2ac6499961b4c553220 100644
GIT binary patch
delta 11112
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

delta 9809
zcmeI&={M95+&*w-M7ANjv1MoMj3uP(vc%ZQKGrZION5Vo83q}$hOD9NWG6)SkbRFS
zvWrZJ`}=$J`wQ-KKXE;NpL0EYpYuA`!7EUB9Eiw32TX)L2xoW&WdYH*zLFiso`zG`
zGZ319C>dI@dJij`CCz9E2pX{Zsscc|Iq3^46M7|nDeRf^@ubtFL8+eo0+}BFBUK@y
zT+x(LHwCzk-sEdhrqV$jNnc5+5#0iNgtApPB~kQU5D2Q?hvEqrNFW!eyIplVjzu5=
z6j3)vbN&1Eh>m3Rf>+S${huq(_va5<0=Jgi4mb;G|5|hGZGgnu=04PD;#2?*q4%)e
zQv@gDm$l!9+>GV#Ne$i~!_&(u6;;=>$Sy+QkvhTfH!gx!6^96=Y~E+2<ED65j!^~%
zQOG+*O<YS|wJt8urXUIN*E~JaCU2ZPn2BM?`Pp@thy3HXqzuo5U|*69p>}gzimnh{
z)d_;v?60c?1hh_*UTLDFEC9S7s?o(!ox2L<Z*5?kH5`>Ja7IMGIn#S#VrGHSLqaAt
zCCBAHeQvPXp@7ES4~Uk>IBD2yWxFZPkF5F((Fa#kOH#02r&MApR)c#|pR%YeYgo9`
z)ab@+7`N(=d6{m9S|~kU$8hz;nxGIZCODaN+46RaKOTs`6zLy_0N<RUMO>RIP6~H%
z2l37tS8tp&<Xbkx1`DWoKm0U<Vwvm=zr~sqZ!%^Yn6aBMtX-Xq+KB3Tlx|eGdJj~V
zAlF+)o|%pbf#p{o2f_{*jzen?|H5nwj-w?zv~bB}SID~S4aqk17#-uQsAMsEvrxlt
zS7~=2d^mQA+Hm3mMsP5|6gM6y@vnWzHsyfPX^LL5%`ir6@L4*A*>F#W$rakbw&=JK
zMiqz0!EE_gt1E&#)COnOj#(U=5$ic>8P&t<vX#LJJs;7{x5$8A&6k@OdVFRf&%xNP
z_1&$OiC-_^6V}VwdIL1e!&&H^)OcN)>@TRK{tMsI?N>l4CTC$`Rs;HLG3P1EPF7m~
z`OM6MU*_LM%h6lUlUuADxN~G1aWztwi<UCegilecbB0|qKEy_E;~kEtWk0xm4DV^x
z``|f>$$bB*i7%zqR5L8!dUmNnrmkwaTVsK1RPS!N=O^v$Z}j3s>N?MnFLgW}^+I$m
zm@$-lo~Iaqh2`mDcdhRvT2RnPJ!DFrbsi<T^v%#+{E6ABak5*7$VTbw^O--Vy6W!S
zr<CrNi~7~eR^$RXBN`i?Su=BgYoMB$isHxt(bBBatc$u@xe*Gw_q(1LKmNk`PWT^F
zeH+_}udjALJU(+esWO*dnxNl_d3i4HcyVk}@W;sm5C@ao`@&KrD4Z{Ur{19=XZ3(U
zB&U35*b&=7SxdyDxc!g$@h4q7B(&tmwLR@4$5YgO&%+~^6Ay+RYU#>@v8ve(!P0KJ
z<LQvv7yMe(3PKL?=Kk~!Wx+?zd;!*Vv_IQk7S$3>A#jUjdBTfm${p3ZrmeB&s>6bw
zRY}-A0DU$=Q`)9*Vk{GLX@FnUtsm1Fs0(^xtD^tW`9dB!*jOv~*uo@~=ZA$yp~K*>
z=@4t{Aj^X#uBFLg1jQ@Wa^E`DamR%M&zzMUv}XNU`_>mZFAe(sJ#hF`P(!^465Yr{
zb>!f}n#n>*%U?&`n~>SmCw^~NAfM|wIV5ZZh@Em`eZX9`6JP2+we8x~cvo^Y=4qm<
z#$<7QmPoCK{u7^!JUNFCA3t&4pHOqL@}h@q90_0LwT9&2U$(Y%DNVTTJ6j?`&0i&}
zMGxf;j`RtRy7+qRhCgpT^{}q{$k;ztjdb+xJhn<xiA$P#b9~*mpr%1KCOairo$}81
zGw>SbPR&-B*jmVqDo)qvDqR)0WW#v<JdhlHW2j4k&U7RzbVgbwJD=F`l?3#)o=29u
zHt}cb5i@4d?XeMmPTk$#Ewp3&{@y1zw#ELD@T*_L#OvjDWqHc<ab&A@W`>5=>k9BI
z_Ks)=Ak(4Xh<&B<NJ&0SMG>ckIg?^Q1H4Jfw7c5;FC&{tPSj+Ln`Hi!V7M3C{2b+J
zYU}Ttg=TbP>v=#?t)g?t&B)uyHN*LI@0|Zc6sO12C3HrIAB?EF@Xhnc(+cvaHXR#9
z8Wv@2bLiqa1b`!5KfYze-eGz<Tl4nO*a(gNCu6>K`n{RRxsQE5VJ%)Q<7G!RKxS)m
zt9<5Oyc0#hEomsjVjWd#*|~o|lI>H{3pkcEJ2;XNPscui7wvqqfspY3q;7W-a*oje
zO1oT7jLx(AAFRF1O!A|<eqnWx)c<PGBBcFS&twh_+mWNj0Y%cwyR6^vHl4|CW9!v$
z%)w7E^x7awtk&VKyU8?f+sh3@Kv2(w(Dj7%e)R<T372T1-=Hx5I*w|M?<;=bl9sfL
zq`<SWp9(FxZ&yd&Ig?wPjf~|9vm1_#b+fjs+aA_4az24@zyBO3-o@km^~j5N<dWci
zT&J=rq3EgGiOxBFYQW2#w6;5Y5^Qe{j2qO=VRakRx2Lj9&H1PHI<)+202j;lG05rK
z*wxx*E@bEy`|uwU%D^(*{)uz}HTa+LM*fj%4O+^M*BGce>ir(CiAP{KHf$e`^jbem
zy)$0q*?<&rxhrO%;J3+dOe&J-$18tYwRQnV?JQzO-)QhE6plV;=%;oMc@y+3oK51N
z;NaP<xRrs=r&VlOWNM)Azy_&&)L<|M7(9$~=;u4^awhuQwdKb&-`B{Wx>pX*+>2pX
zx^HhrgIOs6A~(jEB4QD_k2Y2(GoRtvxE!<{S;~2dLku@oe;aKD$S2C^6q#*HryNf~
zAE+W}4J*p41IqGja&*r$>XXt8F$M{|)ON{J+|cXrd=q>!^gb~Vwvv{JU{LwWv|?1;
zeVmExx4HLEA9|g29g!=EvWkCq)DRU~l0$Qjq6>-VimkXb8=T2%_T{H>z0Ca<6{{Zi
z^Y3HKbw8jvsv4?g%jV%u>8v)HuIx)z;N_00^sKR(TY=7-Rv(dH7WRvgraJ^$M)Iys
z;+-_^2$v`D(P#lbjp3L@0a5Q7Hgs<J(SwrEQBsnenu^6+#0>Gop08}z&7?yy`IC6t
zlY;(gS_eEO^OZ<1&<AGs@)L+ERurf;*rbdxU~2u^)I*JWI87s_Km+X>6fY+qhIWZm
zboO3P;|t8af26ILZKxW0+oY(uDv4#2CapgF<jS#xaR<t|p~+`Ibqv4#_I>7JY^*$^
z+k(G4bMmMf@&p8~SIXX2=1wFUc{JVr+rv7$I8|})cNB&X!m@Xn3|HVnE%YTl<#Gau
zqnU}dwV6fOyqaVp-ZuCKH3YOoR)Z<a%81baJ!@B3bR4o`Xz@4u)%@D%)@`ctXstw#
z$r+?+Ag}_daMZ3B&?^DE`wc{#GI>SEcTE0pmFJ_vFwjY<Sw0v`gs(feR`k;P+4R2L
zrF&i!qQLfZuG&wL=)T5Q4|T0>h!<?pt3C89Lz_`+r+XbksniFh8o>qfRvJ}}Z>0Cx
zcD^)Nj5CYP$U>#bV=zS$Lw}eOC+@yZ|GABLJ_Dpd0+5neX)XTd9{J0TIO~4(AZ_-F
zvma7bvm?12YIl0cD-`2K#)6>^JS$!-3^NK>aSpc<O&k#nRFA%n_)TgZOjqPj#nKeA
zjNg$J2*Q{#$zvcLGVHQ8`+t7_5XYR!koI=IVHWzM{d?YgiJ`aSV_S<(p6sj3Cu8!3
z1D}8<?s>X<Bjnog{{B^u(W2t&SMEdN?JSme?Tm}?8k@MnTp_@wZZiPw)par9@)++<
zxG={(H6SN8ow1#@Idw+HU<MOxge-jPM=p~FT5-CrRddxBtvWa#Bo2yQUD`{v2xqpI
zVK&nvG7glX670pqz$5qiK#j*N49JS$E?~B8>igFR_Kpp*uj3stEMVC;YCLrB!SXPD
zqTfelzH?rWKEma`9C`4iZbdk=d!T6VNS43Y75Dn~Ij|b!HFCbg`7UACW4_=_AN^vH
zlX@iDkdSuX7oKm`kR0c16!vF|(4m#qfRIh+x$76g3xbWm;eT17-fJ1)&SAo8f?(hy
zIEj$muiHAT>mY2L_!3N#dn-5@+(~oT0g;2?l}Or25C1`4kgsvbuh9}*e<2jRb%`Xg
zqQLV*UO?dL*U2sV?7H0#9M^!yHrtu~>zafQeuM#pcyE$RB0EJE@q7rY%@Gqo?#kD>
zmHvem%D19(Jg(DK#IGEIi(ods4S>FDs+<YPrZy#$UG8%p?^3qBmX2B)hN|W{>Amf7
zvOg1`N3rphIK+Jm+5Eh9X3tbuSVN*VQ(+4hU6Ww!?pHCx#i2zCRY)e_oG@Q%y;XT_
zsU~8wShpYIe|v`n(g~#8-Mgi9OL~2c&Dl!k@7|Z+ZRGC^gBpNV!n~qDfDAYR=zgOR
zniPos+$><QnXjPc6wdV|EwFzE>9|wd^w9hd31(a=`+*vHq8q`27<^XAE;weZd5B=l
zTux;m)_y=;)i{(*guUc*6YEvVCsuO$GX##>WWG+gMYbSJkzj)@mOHFE@97?`a4-GO
ziKpd_G9m`7nKCNFeWSWvz(8{vS!uGj7`@O*nu@;u-}^;hIp~6B@b*^}T32z`sFZ6`
z!g!Z<W`3&}Id7zsFkFSh!&mM=Etk^iF|;t7Q+^&mlZJi)^>VEo3syD8sotYEm1CPS
zcJdLfJg!cgP;#GEJCL)2cjAnZ!)`uJ$Z1<4?)Mf=$);3@WlB1r;<(!TEAv)iaN@sH
z$!u7<$sY4Zk2^=4LF#Y2(9^jxFO%|QJvGE$#nJ_9^6_f9F0m&?H$F6#WB73~JFl}7
z&R%l+M;X-wF;cbnHR9<KIt}$S?a?hhJ^$Cn5TkmY_$R{F(z-0Y?4+-$yeJu!9wvOU
z@cF=N#Z)sj^`#?s4EPX<)YpQ1#Pzr;(I-xPHg=62T}|ZR`gsuLGC|s{C;o~2q|hm1
z_Ku80#D(X2X;5g(Uf|#^v3tkFxlD`uQWaD`S|n7z;A@v#oD5aUtjPvD>r28z23r5w
z7sLa3!hTc+7EYm`zloIOh1b5#9oN&*U67LVmrhbZrZu6WXMuzYiuooSD+kXw(}y|_
zLfZByj`}%Hf^R2*1N!2hhfk;~Cv9$Pfw38$A5r;+?mc;A62TVHK&(WbTOx-<zkecU
zFU39y-qL%^!aksTFZnzGf{4|9<pV~JgQoAPofFWbS(dLv!I@5DDcI%xJHMD&S%|r0
zI_ab`tokQUfrq)C!fy2GCfp6~&vqpXz7s#qxL4_&AN{Y1qT{gJ4=%C>VLYd`ccPAw
zP8ozsulc8|G}85qT30}g4adio{ip;`&Wvp_f^1{cp9%b3hzFb_RsEyRiMLF%^yIyX
ze;u_*NB6WFWEMe(HlGbwAm@cpXWF0_;9s}jm~BKh1M6HaZ}u}TzPza%yV$x6Geqa$
zBHFf87(M4T83(PApvZ%Mu=utn$?D$wLty0D^neqbwIw4{Y(oeSTkupLZz*Og6!-bQ
zEzv+0twHqm@M`K^cdFG^zz=*S)r2B#a1KM#TaqKa<u4mfx#A(XyQ3QtzKB2z7_Gyx
zNzmw10Al$yk$#N@a!-_%R6vUPWXE+SDm`Jqj9AN?Ds|EC;)M-e>W<p1+Y6Gx)z89L
zjBi0fhn`fVMvmJNDcdXoUrflz%b=<ysKr{n$amzJM0wMe#=58b;?^|&+`@gd`E%dj
zrDa&|mqV*xx2TjLl>c)2SOi^cCVQFkE|8q!08m?hdp5~CbF2O9;%&PErRX(xAJ*S)
zHPt?O5%Vs8CY&NFB|~hZquQ5#1X!j&K&(Rx$M?&oU><z=!_V15Y|s~s6uXSdMx@z7
zO`FDthRTD=t!i(tb)PNdoV+d>WC`ngM-_W%24yykh|lV-`F=aZO>BRw5(;B4jvjm0
z2`sb*UfTL=Gzne=5A>tKC-n3Fqs5-7xft_y|FCSKJCxvklivh30puUjg7dU6O1~Vb
z!RHkT5;h0@htk~B%jw_SSw#Jg*5>|2ZZUKVVU4Z@()J>atG+G{a1_qhfVxy0Z=qsE
z+D{<=X31*OO$o#r8`}{LC$@?zvhfgGU_g9Urt{iavwRup*F&<M^7)sKcxvTS%`IgW
z=0)%mPH``0aRQ)FVzbLHu5-fJFWH+rJxF_5c51T1aJ=r>TfY}2e$f|QZn6!3+%OqI
z1$#y5El-LQm(VgAQa%B&Q2oLC#|&?7x2%*%=v2|C=s@x6w{yU7rq+Z`lZRkm;F}zN
z52R>-VktaWf^_9)=x8w>fsUD3^&Yc?`K&*2;#)_z+>%8g-c97siN`Vdj7lGSS21g_
zba&G5HHWC6*orNJQ%ZGE<tfvlNDtXL8tFwF{QhQ=(*rgs?Er$Sl~7B#_Dk`_wtP{R
zd~3Lp!s_?heAAq2`g4x|=T!A;CMbIBStMP3g-9m-jZfY9)QwNw_|%P0-T2gvPu=*`
zjZfY9)QwNw_|%P0-T2gvPu=*`jZfY9)c>7NMbKiy!l78UaH0QZRaotCA1peY8aonR
zg*AvJBK`lfs<mi4&>20JlYt#;7Xt&Gabr1oxUf|*FhW;sSft2**X$r$A?&kQZBVi>
zwi?BbU5JH&^u@7WKHS)^Q819L92N)?#tKBkK#Pjl4{@ScSTqEi60Q2bT?B_P6EG8~
Nkq{7+1rz+2{{am#)eQgu

diff --git a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
index 06b10e28dd..67354c0b48 100644
--- a/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
+++ b/java_tools/configuration_definition/src/com/rusefi/ConfigDefinition.java
@@ -4,7 +4,6 @@ import java.io.*;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Stack;
 
 /**
  * (c) Andrey Belomutskiy
@@ -31,7 +30,6 @@ public class ConfigDefinition {
     private static final String FIELDS_JAVA = "models/src/com/rusefi/config/Fields.java";
     private static int totalTsSize;
 
-    private static Stack<ConfigStructure> stack = new Stack<>();
     public static Map<String, ConfigStructure> structures = new HashMap<>();
     public static Map<String, String> tsCustomLine = new HashMap<>();
     public static Map<String, Integer> tsCustomSize = new HashMap<>();
@@ -44,11 +42,11 @@ public class ConfigDefinition {
             return;
         }
 
-        String inputPath = args[0];
+        String definitionInputPath = args[0];
         String tsPath = args[1];
         String headerDestinationFolder = args[2];
         String javaConsolePath = args[3];
-        String fullFileName = inputPath + File.separator + INPUT_FILE_NAME;
+        String fullFileName = definitionInputPath + File.separator + INPUT_FILE_NAME;
         System.out.println("Reading from " + fullFileName);
         String destCHeader = headerDestinationFolder + File.separator + ENGINE_CONFIGURATION_GENERATED_STRUCTURES_H;
         System.out.println("Writing C header to " + destCHeader);
@@ -61,7 +59,8 @@ public class ConfigDefinition {
 
         CharArrayWriter javaFieldsWriter = new CharArrayWriter();
 
-        processFile(br, cHeader, tsWriter, javaFieldsWriter);
+        ReaderState state = new ReaderState();
+        processFile(state, br, cHeader, tsWriter, javaFieldsWriter);
 
         BufferedWriter javaFields = new BufferedWriter(new FileWriter(javaConsolePath + File.separator + FIELDS_JAVA));
         javaFields.write("package com.rusefi.config;" + EOL + EOL);
@@ -75,15 +74,14 @@ public class ConfigDefinition {
 
         BufferedWriter tsHeader = writeTunerStudioFile(tsPath, tsWriter.toString());
 
-        if (!stack.isEmpty())
-            throw new IllegalStateException("Unclosed structure: " + stack.peek().getName());
+        state.ensureEmptyAfterProcessing();
 
         cHeader.close();
         tsHeader.close();
 
         VariableRegistry.INSTANCE.writeNumericsToFile(headerDestinationFolder);
 
-        String inputFileName = inputPath + File.separator + ROM_RAIDER_XML_TEMPLATE;
+        String inputFileName = definitionInputPath + File.separator + ROM_RAIDER_XML_TEMPLATE;
         String outputFileName = javaConsolePath + File.separator + ROM_RAIDER_XML_OUTPUT;
         processTextTemplate(inputFileName, outputFileName);
     }
@@ -158,7 +156,7 @@ public class ConfigDefinition {
         return new TsFileContent(prefix.toString(), postfix.toString());
     }
 
-    private static void processFile(BufferedReader br, BufferedWriter cHeader, Writer tsHeader, CharArrayWriter javaFieldsWriter) throws IOException {
+    private static void processFile(ReaderState state, BufferedReader br, BufferedWriter cHeader, Writer tsHeader, CharArrayWriter javaFieldsWriter) throws IOException {
         String line;
 
         String message = "// this section " + MESSAGE + EOL;
@@ -178,11 +176,11 @@ public class ConfigDefinition {
                 continue;
 
             if (line.startsWith(STRUCT)) {
-                handleStartStructure(line.substring(STRUCT.length()), true);
+                handleStartStructure(state, line.substring(STRUCT.length()), true);
             } else if (line.startsWith(STRUCT_NO_PREFIX)) {
-                handleStartStructure(line.substring(STRUCT_NO_PREFIX.length()), false);
+                handleStartStructure(state, line.substring(STRUCT_NO_PREFIX.length()), false);
             } else if (line.startsWith(END_STRUCT)) {
-                handleEndStruct(cHeader, tsHeader, javaFieldsWriter);
+                handleEndStruct(state, cHeader, tsHeader, javaFieldsWriter);
             } else if (line.startsWith(BIT)) {
                 line = line.substring(BIT.length() + 1).trim();
 
@@ -198,7 +196,7 @@ public class ConfigDefinition {
                 }
 
                 ConfigField bitField = new ConfigField(bitName, comment, true, null, null, 0, null, false);
-                stack.peek().addBoth(bitField);
+                state.stack.peek().addBoth(bitField);
 
             } else if (startsWithToken(line, CUSTOM)) {
                 line = line.substring(CUSTOM.length() + 1).trim();
@@ -220,7 +218,7 @@ public class ConfigDefinition {
                 tsCustomLine.put(name, tunerStudioLine);
 
             } else {
-                processLine(line);
+                processLine(state, line);
             }
         }
         cHeader.write("#endif" + EOL);
@@ -232,7 +230,7 @@ public class ConfigDefinition {
         return line.startsWith(token + " ") || line.startsWith(token + "\t");
     }
 
-    private static void handleStartStructure(String line, boolean withPrefix) {
+    private static void handleStartStructure(ReaderState state, String line, boolean withPrefix) {
         String name;
         String comment;
         if (line.contains(" ")) {
@@ -244,14 +242,14 @@ public class ConfigDefinition {
             comment = null;
         }
         ConfigStructure structure = new ConfigStructure(name, comment, withPrefix);
-        stack.push(structure);
+        state.stack.push(structure);
         System.out.println("Starting structure " + structure.getName());
     }
 
-    private static void handleEndStruct(Writer cHeader, Writer tsHeader, CharArrayWriter javaFieldsWriter) throws IOException {
-        if (stack.isEmpty())
+    private static void handleEndStruct(ReaderState state, Writer cHeader, Writer tsHeader, CharArrayWriter javaFieldsWriter) throws IOException {
+        if (state.stack.isEmpty())
             throw new IllegalStateException("Unexpected end_struct");
-        ConfigStructure structure = stack.pop();
+        ConfigStructure structure = state.stack.pop();
         System.out.println("Ending structure " + structure.getName());
         structure.addAlignmentFill();
 
@@ -259,7 +257,7 @@ public class ConfigDefinition {
 
         structure.headerWrite(cHeader);
 
-        if (stack.isEmpty()) {
+        if (state.stack.isEmpty()) {
             totalTsSize = structure.writeTunerStudio("", tsHeader, 0);
             tsHeader.write("; total TS size = " + totalTsSize + EOL);
             VariableRegistry.INSTANCE.register("TOTAL_CONFIG_SIZE", totalTsSize);
@@ -268,7 +266,7 @@ public class ConfigDefinition {
         }
     }
 
-    private static void processLine(String line) throws IOException {
+    private static void processLine(ReaderState state, String line) {
         /**
          * for example
          * #define CLT_CURVE_SIZE 16
@@ -282,9 +280,9 @@ public class ConfigDefinition {
         if (cf == null)
             throw new IllegalStateException("Cannot parse line [" + line + "]");
 
-        if (stack.isEmpty())
+        if (state.stack.isEmpty())
             throw new IllegalStateException(cf.name + ": Not enclosed in a struct");
-        ConfigStructure structure = stack.peek();
+        ConfigStructure structure = state.stack.peek();
 
         if (cf.isIterate) {
             structure.addC(cf);
diff --git a/java_tools/configuration_definition/src/com/rusefi/ReaderState.java b/java_tools/configuration_definition/src/com/rusefi/ReaderState.java
new file mode 100644
index 0000000000..c68a789cbb
--- /dev/null
+++ b/java_tools/configuration_definition/src/com/rusefi/ReaderState.java
@@ -0,0 +1,16 @@
+package com.rusefi;
+
+import java.util.Stack;
+
+/**
+ * (c) Andrey Belomutskiy
+ * 12/19/18
+ */
+class ReaderState {
+    Stack<ConfigStructure> stack = new Stack<>();
+
+    public void ensureEmptyAfterProcessing() {
+        if (!this.stack.isEmpty())
+            throw new IllegalStateException("Unclosed structure: " + this.stack.peek().getName());
+    }
+}