From 8521a42f0d615215fbc278facbba7702951bd0de Mon Sep 17 00:00:00 2001 From: Michael Zillgith Date: Wed, 17 Jun 2015 10:56:09 +0200 Subject: [PATCH] - made SCL parser more tolerant (added warnings) --- tools/model_generator/genconfig.jar | Bin 74669 -> 75191 bytes .../libiec61850/scl/model/DataModelValue.java | 75 +++++++++++++++--- .../scl/types/EnumerationType.java | 9 +++ 3 files changed, 72 insertions(+), 12 deletions(-) diff --git a/tools/model_generator/genconfig.jar b/tools/model_generator/genconfig.jar index 15fc1594e3fd04085111621bdd7779617d15f73f..191c492a89df84495dd94086d3bae03fd02ef437 100644 GIT binary patch delta 6597 zcmZWuc|26#`=5(2B-_|`nrtJY5ZU)#5!siqM95N>s41aRMhq?@TiKUkY(+$NQnqA^ z7E*QzDSdu-E`7e=zCZt*^Ljt;^M0P^o_n6T&r#M%Ro6?!U~WW7g+kEM(jtn^4kR!r zQIZG4YVtq;00DRu0VLt^G;jp8zGW2|2hWdo;8w&$6H1x;4#2P60}DF>{Z4Sdu*bmB={5su#x!9SG${ z%7rl=BC@KMGactuPHZ)DzPKvgaqNBjVO)Mxs9=gf*s8e(l|XN*)$7|0ADoBpa={oWNB=?*9uF~Z z)FLrzr#_+fcth$a`ks|d+$;y6=W;tf}SN~vgt1(5U=ybk( z;uX_S$*#~3ivGmZ^yEYBON}m%`Di$Xo~jf{U(gw1r=2^%jx_nb{4s4xIsX(^wY7+V zFMfQ+;^&3|?T>#L1t@&&OnW&tzDl)F<1`f7e5Ibq=gsocxkb#`kA3coIoUsF@$o?` zG2^Frl(t)hhI|~wF1Pr&<^89-34V!%ZKU>yGdO43m%9*mu6Jhu4-PIF?y)f zms*owKy}e|MUri0#(~SJ+fB`q+E0<8Dma;5Rp$C_kqGx+SaH zs}89(C1S1)?Q+Z&l-H0`p5+|KQ8P6jv-DXx2hq&;%Nb&XUqWwRj!cP^-`KS)^WeTH zjd7({x0wt67Ug>KNtXRJA)fe6{d%VOZY86%E_4bPHHl9}@_XbGq$~`2Tdwwf?TgGqQyzFCz9?o{yIC71X=6E&l z56Z8H4iBr7MeN`XUCrdQ0oU*WLD zhHC=_o&70i>-#%rxU=YyCvsmX)&`x`de(Pxg7A%Jc*DQ+{XE0QqB={iNAIzPM?O(^ zt5|F1BO@Oq&1k*Q^tay@zo;mk*c&i_nokIxp<8TyR(*3k%iMZN{JIi#<8{GP^K-=q zbMEG~oi5@urE%nYD~|un^lHnRh3WcD+$57#eb__)lWtK#(&WwI=t}9Qa-2oENbN#)5a4cb8n^vsg~Y;^SXgmUR7p)jyR)d z%8J(bpK*3qDz`dQZdMI-mpoiQgk)rGp`CtxOt;x=k#*R3eS}YomobemRH|Izd@?S8 zevqH~v}B%B2Vyko)11I(x_60cx3?sVB8)O0e5`(M(HfRug5)@SN>5qTgyotRwlsu? zBb;}V-}He~)7zgHIGP?iRLjg7nSgZzJxgzVtCwbaDrmT>6)`5H`?+pcV!E)}ik}6o z-tTb4-pj#{o_faE-+7T!z|zk%O_{=8e^s%*R%9luMm>bd1mivA0dPIdl97ZA#f7Mx1fXx5}T-B~tq6y|$YLdUb z@*dEVNCxOgQ;tS^b+54%O)|$$AAso&k$ZFpFB$*_ASH!q z(VRqs%NzhB$uRK9L3lyXH5GUyatje=jHtkPPJo}ZdCd(jyCjE5mAy%3^v6B9KRh)~ z;1KwP3t%F3+{VMfkgV~ZuoqHGq6`fzYTE(3Lz0Bk-@?mDyBXj1BEMw>MV?1Z;LoFj zsf+89B&$50J%LLFB7c&VB(;}N@8w3Elmw@F0VIi{EOd`|wX$LF=OHs1O>(ZWVIWJ9 z8e1Ri1#R2$YtQ_3Rx&TDXU}nCt0cI{51>dLul)8>3b27g0cH3AD$rN}V8N9o*SLI7DYgu zHV(m}KRL)Q6lESwWo<9i!l)i8aGh%O_R3`m`A33m$nGoe!aC%XNu=rJ5L`qUqdHxj zn1>8c3u;by@Csh3;(b^TQdk3rVKNZb!LS%~CVp9op|e)Ddv+u8U5)+Kf~jf;m4z_Af`M;~<8}?Tn$Dzb zCROYc)84gy@q>MReqvNXvQ{qj^VN%i7YkfMyggndKg=oiv{i76Zt7*gNobcWId)cA z^Ziy!QBWbZMavu4d1lr7y*oauq}v-f;ZSh7%q@IkDL>{c1BYwDjSJ%6!N#QW*u(f@WWvni)7E?Cjik`@7 z8vW3m_dQU^x|_#tWc*4_go|XdspLH$RB?3j2dB)8Kw>;WV4m4N3H0|iCZ_nMZ;KG<|PVfm;Dd``1>w_iRhcAFqQEOBWlQO6&R$LI6dpjKFTTQX= zbY>3WD6>R3OCus@Y@KLuI$BNMxi_0)bWS*ldcX_A%NqFKCT=N28Y#3mnF^nQhywbNq^(K8&+Ar=%^)jx9OX9dM!yZ}8PyL(1@I(KiXv zG;0tw$~Yq~j@MwPoLj42rJgH4U$ro(mi&WuI2fb>%Y_FCOC)xK7F!@OTIlOeZqgWr8prB-HUw_LH zu50}s3L&H?N0?MC7%)fF&k-=$5u9u$`nfGcAQ6F#-t-7EIO?YXPNZIw#u;qS2sT<=;5V!30JqO{`>vPq~#f!>^6>bjpc+lJU{N^_zdLhTCMM)%l# zXHa{^iitj(a{@iT_2S@jP5YypROYv}fkfi2{sAHfB^^J~nJIo}Ej43HeA^1)9%>)C z%knKsz^v!T^~j4f=J*w{P>Ji&+vQYdlG~1m_m6MhM{UJMzM#8SICC38HS94o%z6Q9D_bObAR@fxoFRvp*VyBw zk=A1`7a8h;R|fMoRVaqe%=ry*%kaFk{AcdYCEwsynQ(*8qXw^4IX_?f{Vc}o?FA}% z%UbQS-~N5`@*DHG9`_P!41;K1rGN8CUT5oNd7B1{+M{X9X<~uG9^D?mimfa?s*W?C z-{5=5!kyqUW!-z5xcMHP^Fg9qes?>L9Mh9%e*E%HZo}w>0KEd%A)x~m5}_{*KvjN{ zdiGjEA%7i1uiN?EXHPTljQ91RpL|fhiQ;3`Je3l9ybE0vii`JHNF<&ZAmlK7-kiLw ze`P3J4{NI#WSlEN=jcgi?t9mL)5Go4*`qe1=K5|VFVBFNmkM4QqI0hhgl?Y7(;(G+ zmwj}|B<}cW9Tj|WJ>vz-$#@#eVS`nX#+I4FP*w*Dqa$@@Pjee;pLENqEXbP-gny5U z75FH6rq^!ca-ae3Wo7ESk|!~7{5N9j&@0NJ*6qg{MP)oAEEgwo5-cQjw{jut}lY!E5x){dA*vx0)N;Lm}NY#lvVr&-DCT<*IN7t5~$ingBg! zDi>{>o+N2`K>+7%|C4wsIw{S#{i9Xun{am8$;)ynZ(=&AMcY{4rc6iqV)Y!1g2F#* z=YQcFdmO%uaZ?ztF}^W+*1iqRmNiqTt|3!TSVL#UnpK`{_nbeoX2kWbr~Bu?TUl;a zvASclQB4vd?Xox8ohrX0F{xEsag`lq2?nLzQ!W`DEgnyBjk$4L0!!G2Qo)dRhDo+h z<^FvooSqLodF=3s;w+oW@`vT0?r4l1DW8xnk<|-1@}RED=Ii&)8tpTlE7^jd`)ot# z`sN&aqxxI%wmydydNp6wT8PJ}NIKo^yiC%|Rsx?Q3ypblw6lD2KYg2cVF

X+vY}0VD=Xe`*PQOi^>>n&hC!i^(yncI^ZR*OiOS& zPcL(V2>3<<@Jfv zZFO%BVp{Dnb3aQ46Q;D&k}|hWMkJ08rE6{4Y%lAJG|wq+oz+v4xvTYYd*bD-)K`@^ zv9~{N@j89NapK-@({zp$L*Mw%a+tT3jh>Bop$>|u8{zLH*g6&NoErXCAAMnYO*t;t zy3(I2I#Wb!nYZJ(tg*DXP@y4~y5P9SA?%xWQmTWjXxx)dV!b@hdmSs>nprWjV|aCB zCEGl3+Hm=d6L%d$PE<$o<-zhWyu)nHndz{;kfzVZxDIxV&Haw0qZh*pLO9tH`Ei$1 z!bU+{s^&s#f2#{7P~S|c_sp~myYfPw1<@*)odJ7CE8RaO@x-Un2KRUV%RPM$4l6T; zmlG%gPtQh`2VZhnD%Db;s(KVNAYyio`jWWDW%+c^R7V-l!wSR-}$>^KPBd<$GM(lI5@Vji~WSNSKbOfx_mc z-V8osf2**Cy^_vON2>M?4bkDa%dOk$tP`)Lf^+m1qmNP#h;CxRP`ZZpZ!+zY#I}jI zBK?9w{X*!Y&g%9b?*14JHU4$zXIs{qBH>c=w&+6~>Yr9%?cyns@((rv46njajn7*{ z2jp0#!{%n(U->G|7d;nx<;uIMJ>PP3<2e4w=zNBCixyovTdBpWjDOtP>eTHsuPJhz zch3&9u&_RfT$fz^b*tt5=A!iJ)E|xCjZp5D?FtbRv1jZXY0HMcx>vFX`aJJ2W)=U4 zp?}MvM1yo26 z)>1T0as`VvB_%&}_sa;%RS|f1Ve(SmvoT~D&!{A>Ys)@h=PSFY-^3?rk=fCfC_VF4WBNdyaE4^Jjo z00(%Y%nI1SlQh1Y!Lm zGU)CFfePU6ALc<02u$~eKz4GMd_<5OT^VH}=RK$^e+g|68u8zM-o9ie!QPh{EaljD z)SK`u+@hf5QlYK+^(`$P#_Q`kQU}I9no}{3FVChhoPk~ zJ%z@-APd=mJLMFEya-j~e-kVej!Hd)j=xAm6c2J0kiQn^^fT8|pi_;Jl3aAisV!u)(>8 z1FRPW4hoRpuX9tWg_@Ae0`!cI{w1>lw(tS)^$Q5_L#yLD{*_hY2l!!GJF?+k&%OZ( zg8Tp%oQuiTlmJU;mw2Fj{+50Eip&PH1pr!b8Pb92|29`pGBSTf;XU}T*FR0vo@-wL z$o26zf5i5{7BYw)CxeOO93VZEB^)QWAcXHs?n@yF?67UZv~2=vPg$9Hv%Y7 zh=2d5p{rhJy!Z=1AdI0s`CBx3oxB)SM*=ipGo%K~PLXB5Y`_*K;r-Y0saLc)A_esH)@b5ykC|VAUY){Jpc|s`wl`C joD)1Hvj2#UM93jA@7v(LnqUMNK~Mx>qMl`eQbPP6Ys@XY delta 6273 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