From a731fa2dda47dfd29c48dc0b3486837179474c44 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Mon, 23 Mar 2015 00:10:01 -0500 Subject: [PATCH] modified: src/lib/jsmn/example/MAPTEST.EXE modified: src/lib/jsmn/example/MAPTEST2.EXE modified: src/lib/jsmn/example/maptest modified: src/lib/jsmn/example/maptest.c modified: src/lib/jsmn/example/maptest2 modified: src/lib/jsmn/example/maptest2.c --- src/lib/jsmn/example/MAPTEST.EXE | Bin 14250 -> 14266 bytes src/lib/jsmn/example/MAPTEST2.EXE | Bin 14126 -> 14072 bytes src/lib/jsmn/example/maptest | Bin 10096 -> 10128 bytes src/lib/jsmn/example/maptest.c | 12 ++++++------ src/lib/jsmn/example/maptest2 | Bin 10112 -> 10280 bytes src/lib/jsmn/example/maptest2.c | 19 ++++++++++++++++--- 6 files changed, 22 insertions(+), 9 deletions(-) diff --git a/src/lib/jsmn/example/MAPTEST.EXE b/src/lib/jsmn/example/MAPTEST.EXE index 4b6028638dbaf6330f5f02b625e99549f49c5b4d..f3a71677a6e6303602c6ab88a0ac826735d3e091 100644 GIT binary patch delta 1420 zcmZWpZERCj7(VCrt}R<{yLO{-ONTS5h&L1c( zmJ-hHJ{;%AfN2yV@)07_0$w^2=1Nv!oAQysgc*}1CZ}$qd}NHS>Gj;Q@W&=Sd7kGy z?|V<)Jm;L+5#3>XdtDUH0W44egIbcB6(9(}F)aWl@bp)q1K<+~s`so}js6Uc zD^Wi=#~?n5ZbunVez*Jz`j_wux_m{|6!N6YZwQS^^n@yQg}|o-Pa2JH+|;;MZl(l; zXT0?u^b@*;?gW=8{AOVTyKn=80@nz`Rt@_N)BI;e4MS9HxYwr;C8=?3Oti2hhjG_8 zWDc@tT+2o+Kr991aTe-F{3KZ=kuD{QBR(CT@GBCRp{NEfu^PCDLlwHrihzB}>=_oM zd#}+wv&`sO14aqmN3kdbXp&e}sE=xOGvfRt01e`s)c8ax8>isSeidltACQ5xNPAFo zt)jK<8$oz^BRg>DE;cc~aqCzlm~1C^h90Lg}f6G7#Hnhc{>kCAyV32YSAo zF8U-*?WO;>AEkDqY!{kRi7-g)13f=Xm#mOWjL%AnpMByy7#rw`O}k2ESDiSB_bVOn zH{7pu!iN#9%A5s{;FmPBVF1@^%HUG$*9<{5ew|yOd!$J$l_s1j)_)iclLowt^Krjx zXqO)ot0g+P>o~>Lm7M27yVJm@7HZUFl$#Nss8OnYdYS^k$r7N&?`y}Q6MJ+kU;+MG zx18cpod|WfE4R?0)gKMQ7VT$HlmNM?AzL)As8i8)C)HXFKwIC1Tp&XD@Ql~DSQr+Q z+Lo&q&#-P+L(8vie?%AH`?WKA+t-QjfTCkfq_J~ z^fa&}3p@1BRabH4y|Kirz+F$nB3}Sh75Wd@_JrVS02M2?h zEM4bNl1A!7jP-S}1dr;s!Yz2E;RRv?(G)y>@4$k6&-@PcyIB$hR%nZ8rRXu3C7b5GFlYmBz|0+f(SnD}ZaaNUO@m5#y;mZy*D}gE6UF&+sq!B@JYg{a delta 1429 zcmZWpe{2&~9DncbdfiH|UAs{NV{1E$PH~%a5;tK30$xRBb_}{Q#!%FVMnlAQq7hoG zB|eVL)Mxk=#o;6nB%pT6tr(c=vNGlZ5rwfS5);U4Rw53vK&d_7jmbY=a_@aU-}n7~ z-}k=nb1%C7(E8G)jfdb&zyTJRvlIofAOOG)0{}K~_nBn`;2Zkx$^jsi6E2+w4~NAn zxFH;v4n5&LyWmM&0aLIyQp()N_}dvzJ&MJ(0K}b)I&g}zD&~^SfQ0B$ox5QLx)MzC zsE-_AkeEUjq6{b>Dep(uNhM2%Ftw(UJ5&C%)SN=Msm0DpVp?)%P;&K}=9OwP9*|1L zQ|CrMqVs4tFpu@wr6z866NCI`$xXIu$Y-A9r`W{|xy^>Uy{xP#%`0Pa5l8-k^>xc8 z3fYo0aM2v_$WD>xpR3~5k9EcZeR?`?4m zj1C;{o%DKC^{SNz@eaNk4&z^VC%h7wskLk1=eS0n4>#dPeKD-YLH!`)ah>p>aZI0> zuZ%mjoNo^rA})*suP~ygS&k)ED71HHu+C6x?G%EWGr*fAEzTmBh3xqFVm`}jqK7Ft zIg%0Z+lC|*@k_=fFdH8+E~NOnQEq^y4lmqpXn`FY>GUq_c#lq-VZ}8Wm^uO!zYk>v zkf@%l)w`l1+cunTtpT8|rz;1@5Z*ZI@y?Zox&$Rs!&Bsbkq2Frk zVnFADLA%E#0}wR=(xvxwK09c4$u!ZBCpIvU_*%KEMZyZI(x}YPDKtiQtAYdc6M6Eu zP~II&JOS$Ks8Uq9lbt#$Wp@J=-33x8g!=uw&m0 z4S0WUh2wx4@aca6F9tW?0={*Wk|R3DJk+Bi2B&jHct2j0R|4O`Z|1Fo4m_OqJgmZV zr*=dxPp#pg7h7i(z*lkgjLPXNQbE5C`1ISH+JlUDLENd^3M8kFI3jH`WS?8UGm(qzwpw8}S%igGP~(ZifZ zJ2r9a$Q&ToB3~5kn_>$8Nt>rw#u&wNlR;+_Tk!JIhiRTIrDY8KJ@Rd76@;Ehvg{fM sAHf$NI~4g~j)5t@T5`3dy{x^A-m10}ygFX8s$=(rWxtK$yj*Je7j{Huv;Y7A diff --git a/src/lib/jsmn/example/MAPTEST2.EXE b/src/lib/jsmn/example/MAPTEST2.EXE index bb07fc7fca4b69e0cce8283e709f522a9ea14ec6..af8cb79d15f86e3094b4cd0047a84c6da54fcec5 100644 GIT binary patch delta 2920 zcmZ8j3sh6*9sj;BH!mIuC@%@mTB*E3qKL&r)K-I~Xb~(TYOt;AdU~eaFu}@DpedW5 zH_~?B)^%-<9l}|i-Fob>TNDS8Sb{n&$k|4b`C>a>dMP40ngZtTpJ;n}mV5HO{?G6K z|Ns8?e!R=KQ@^g#hY}EnWN3~`lJ?6`147O)gi_FhpDrAs58>aeL1;qrmOd6Yyk*J9 zmbV(_)n_Rx$~Qer|Kk`Vw1-~fIco9qT)wyFDeA!k2bHh8Z7a-K)e$xM=6$v$=502k zd6_L+j4-Fz9y5pA=9|^koH?XM$0r21%_*>}uU7LGKjn`5#cYWaKWRE=OXaO9dY(=Q zc~XEoY0!6j5^tH76_OIZkjsS0^$02v zwh_l!g$tw6TgWW4$NV41V@Mnxy@1TvzT2e-?i}DI#wnx3TYaW_#l8yOa&INI%<|T$ z^t+$P=;Xl7dfwubs}MvEck}CKL80)HgnL{D5Wj;#{Cm8za{oh?H361@g-ZdJLh-kU zR%5Z;Ozb7bso?pa1Lxn_z2RC6yhnoSz=Q9pq}ly^xzEw9!sqFkfblW^L(TRFnmdi| zU}Qb6M~RTbdgTc_^N{OtBs?jj7T+Puq;SCRia^4MjP^i!!UV=qkF?ZPio~7#dS3@3 zr!YG7v&s9yYd~mn?@JJV!qFZnx6Jh-NQA z&XDu$*qbsDTLM3N^mktUG*$1Jv@OF^0|7G-92{e4jQo`1$ zwrT;;gTfAG56i?F))E#K_DzJ*Eq+NS;W&<+2|Hb1AZtF;abM=}Xd6Z*(r8jCNpmI@ z6WQ>CljeSY1Wq>+exU!$2TxiW$)>2HG-I;?YiY}%)uQhwS8qq;E8y=nsK6Iz?1z?&M{0QtTb`hIw z)!nuX_p#&X*fS>#7gN)YtS4y)(w{Dc z{5ZOM%u%ovJdAUFt!dp#oEj@>-44_9q;&^OFOtPyxu!I&FTwg{;*yYXMJqV8C8rA5 z9Zg)sO}NJCeOy^dsq^#ZYo{XFJZ(}@bofbvPOQ9`T2bOc=#&--L)wZH#TQdcT;Tj* zh3CSB(c{vFa(agTLs$?2>62MEduT766n-PY3YAe0?c-yG1*}nPS;o{}iyxt>)k@A5 z-mpVC4O@&Fik0|ejFt}22|6uokD%R-{eJX-fldIG6OJ()kqiZy8sSL3t%H0+Bb_oS zYRT@WrYy5E+Y;CYAd)RaGEcU zIQILH{Uz86X}U+vv^%g`%bbxGyoL=#W@}kIu*;wxNB#cBg0)OL=LUY2-I)`O+n920 zI(~r}=Po5k$6lVh5l6GGxjHGWuDX$qPP3P(L3*`qoPxN&AJ*}ZM5P$9Ef93G8$o8Ly|Rl@aoYVXu)g~}GmZ{^?(AhfDr;VtBX!B^Q7bV7=m zAk-J^3*b(dB#C!~y)o1)z7IJQ_DZxHu=1v#_JRAQJivWj^!)Z+(FTGu*axv&QUK|0 zx`&8eWi1&P5+6l9eAOIYi3jBbnG{7VK5hv<%}U}PQFjucs~rVJ?5A-$c@Z%s6|wi? z(m~N@aqr?{wtZeK-qHT*yagD)&JM>vUtflOod(>XDZ?DUS^)`AwT_c2YvmS?D+~#L z9fy-ufmQoB^@8e!Ef5Ghp>kTsdDp-lX~7ub>$sjZAqXZ%kH))3fsoi9fa{--b4c*r z6)(V5y}_VUPyYzK&V~kVb{TN`knx-zu1oMg;bof1FXgMq!9pdJ&(W23?x@NZ0%7^( zH>>Df@ml^&wXboehW$|&kMmfst_yB-AYlwfd*Ty#lDQI1>MRWTjE08DW)q*uog^k` zhr8AM>JXCx8lWa{Cq4>K=6CNI65k8-%&$uM7$0ewB3{L5f>MMhSbfq4ZQVrIFzGl? zsQ*B3IHqw6`dw3-zJ^-<55u6dnW8gq{b8N<{YcnjG6#cOIwXB|6}9jyl17Y28xrj}jHj$H_9l4^CI>Dn(Qt6Q?iU)cR!p)ExqRTPA=kjtLSi2}&iMU}@S&XY3qS`-c{e^V?hl?kr-OCW;cSHd E2cahC!~g&Q delta 3071 zcmZ7&4OCOt`QH0pUJ`)>6hT2lP)kK1CV(gsQ7VM4Q%un!qQ%a&Jw5%g8z$K9s01@w zuMh0#U0v7qoE^lTS-R6|v0H?m5(y*zR0Ta-(ORw8wU0hU1WPHbs>oAENaS;a)rB;GFYML+*6&(sPp^uu&bIG#S?!Oz((OxK z^W|u}*)_)=8WY zT}#i_ec@V0!`8V?qGOCJCQh-KPlL%f2RS81yj_A1qk&o2&bj0M592{3Umif%j@=nP z3t&G5*uHk0z#3BP$1uuD;o+ib&QLZcTy*gaCH1a zzvvj%=n!>G;!d$-90W;g6dd$r0hLju`Y%+jZ1NsTx{9JozJUQnafIYo8;Wp^{A)XL zKW9_Ipz|u|e>D2icCw*R$vwU^Dy-BI6`?@B;mZL=2h|NI_g~^@uUIzf?bP8@^th^* zFLY1nOZSBywE4qP3;5;{$%<>%K3W=1rP>MP{DN3A){aOUMh&kF|0H<)JLgt?P%rJfWOy*VXsr z2^Q?a0YimPX8l4sE@Vb+2L26OrftO~t+%zav2K{uec_(kafij}vo*tnnuggLeZ4jt zS1%KDGFiVqvpgG%IaVy6w)xe$IUCDlZkVGtTNVLq9b%n;v#4#I3qdFkd3!% zL>Di=O<^g253p-db$-|WZbt|YxD?tWzvCMu0pAdNe#!}anJtP)HJ*qXSgwo~YkBuu zv`WSUhz7dRuJ(*?{{~< z6ivuml*B(*;-$}$vTwh94DLWQrN&^|4DPlgbrukLC zUvLo@S1@vLfxqQ2YFTsCdL}vLz&et$C*?6l3{RC;lX~GLB3>5%e&7jWPT4^y&>rLX zjzN-k?l2l@@#b$K$UVcCYHZ#@>J3kl=BHtLhBQA5)AJmNTLTyGQ^%={Lt~!(K z^nvny<$=?u2M#NbmeJ$%pVHiDh!$75AwW;iVd;+wtPr$4+9SqGbJ-fBV`-y4=m;S+ zTBzk+QJyEYlzOYg2R*4)7If>tYKPW%`g#XK^srZt069)UXgEmRtucCoZ7{lJ5VR^ zU%a_;V*r|xXt+b_PP%mzX0;gUX>c8^!C?)0+ACiVH!hW|Zqyyyo`Y*AO31dyM~el{ zH6@D}`>}Q==sFSYD)CWfk1)VEK+{D9$BQ@z@0T)#`S~{0Nhm^QcLdWhG zPKTmE*=&D(dIBD1iPPt{u9$8i*vejv-)M%K_tWh}?pWJo#gG%RG$3xCDr#|`hM+vb z$-awUggcpe#vFYY0l40q?_@upk*IN!Jd=|>HzO4oy)ol0T*9m~Knv-9+s7@|5IS|j^x_L}T5k_U|uUMYoB@&ssw2Gu4p77yokZoeeI zt#;3wrD9x&G)&&ptFI;(m78v?#_jw5Jz( zLwmmplWHdhSxizQ9%LCw7QBmXO8Ni~v__ae*5gy`cxp`)ywY5QdjeKv@2ecwx_SX2 z_#ktpFED#Z6>sx{Hl`NR`xOp|TF73t`l?9ykiC_@G-BQL+6jcW<$Chhv8(9`n!k`Y zrBN12UvF^w@~{o;0D9;6PI;+2=p{$eH9sKcrqnlM|?% z;bN9@m~A1%k2w}vG@C%bP3+}`iy!PJZ3fLqw%%tRPJ%SdJ7wS;R%T=Q8Lk@b)kaTo=Kvus_~a)LPaM%KglEW47mCBke*OU=k^HfNYyi?UxN zg}VvTV;mvy8jXfIlS!Y7T1u#P>O HfzZDJ{_Y~e diff --git a/src/lib/jsmn/example/maptest b/src/lib/jsmn/example/maptest index 4825f5a13c4b4be5121bcbb2247d070adce6eba2..a72fa7f9f215fdb940dac204d401a2f9b47f1db2 100644 GIT binary patch delta 2340 zcmai0Z){Ul6hHU1uj^!N?bz1+FF4u_%@_+H;4pNCDj`A2aDzquY+>RP4Psms%&=P? zi!QUK+eHl@6!8OspEQkRkr6tnP~%J*;s-v6DY%6?kUuNTLHHtFi-y0D%vU z<^X5xt%Bq;lSM7DA75*2`ukmPAomsZWON;WpCwrr?~!i!hE5sHrYwL6Vix)xC6v$` zp#k7$LL%>Wu!X5O7tiue3>81t@lmh@}p>jnK0#< zFnPUa(UQ7;h+OPWyO>iUHV@R4)G1HAkLH(netr=<&zI!antEy4alRwJv|J>W)8LN# zj?Hnv2lH#zdnQG3VjucnOtrqS)89UYduH~hd0V~SvQ?8Yk)8`9c;>3{^8QyBFY^a; zaHnbKcp|@*@!-YPbL1Zai-+)+!s33X~-$T5a;ui~_kj8HD2ZfKae!i&4&ceJA-#_toeE-UOgyaOi zzvd(O4)SY7cGvh_UH4)fXv{VDN>9(1rPsgDF&be7id^XT$-giTZY@}!!{AwqEO}vl zp22(2WHCtIF2h#tvK=Yuz{9NsZNhl-lp&IRDSjjTs%;$`<`u<077cz<{F3A&Q`CR~ zatYwz49^ps?kgG?=z7CvYKB_{rw}wSK)&FS8NNX9(HUMKI9-M`FaRzLz;d8_E-fe` zfZ-XAS0_HH8D1ufma7wx56%ADj!u;vJU=D#by-A zm37vs>1?f1F?8T@(8b-Abu7WXm35NwG(TCn)IlAl1+hXNOrnXn3=k|>!+qp*8!7x= z<>Tl-=(L}a*&x5V*e=sbb#UgW$|es7vAs54>#)n|e-v9BRWhy36hDL`sv^u!;E3vt z;K;^fjvSd*W0X&#T>L5FCC)0D7GQ`s;)rS;<}c%jnx5hV&MK40u7rQj`d6q{h3`;Ri9^2w0YAlXAv&30-AU=mv*^OHaI=WYMl~j^7 zU62$r6~)bsa3?GpwzX-+E7HP(DP1vBuE!zr&Jw;cw_+{tynnas6v~ zUFZs0dz#I){wuzCrc4So<~wKl;&xvs*jx%-Btd(=N-AC~wBIJQqzraDX#K%uqySHb zaAHvQW90J^$r!q640UxzKa$R9SVMH1pK_Qi$8KV!n;f@_qrL|>|B zSpJDT4J0&yS|#8bW_)v+(Yq+&PApZF+(}<&k<0WI1Y2V_RMou>0|i|%w=!{;d>8p$ zL&C2jUn0Nz5`KkfNFFB93zMP)L-3|`QV}P`%7mf|ox{kDI{XrRX!G{0fQaN9XU%yO zT#w(E^73@sb7*?OH73?^oF`HX)QALncM5{$Mx&nasfp>cssEP7;A+6Z=iX}K+p0oA024x zI2)V{wBq4FRTSvftp|Z#ooe>N zNac8L;49eLlh%4hygo*G6S>&S@0+ukiD#wT*$uuVeZIbt#3%Wl^t=KQ)VRbI_a1%F z=wwzM>17LEyeYhj?=HA&eBf^$_CbQB@5io^4J_pAjP-F04={TTa%S7+PUFyD^jHQs{beSShndT|`! zmvQ`#vmBdK`b$+k7ze6T4Xv6Lvn9>m&y6}AJcS}B`rU;3Iy~8-#>n6qlce!LO`6v8 zhTf#rc=l_nc|*>j+!{Q;a?z#(FPD5ovd_c+Fu#|xoE_uKEM69ger9<|<0VtnfEH2- zpni&{2~JlMO|*2L;B#?`n+2y3G|@u3;NdBrA$aE$&lH^QJDO+#cLv}|psOq)$R>be zQygzcd7T8z^_Y`=|$3I9oW?%*zb`Doq zZPm&A0P|gn(quji^Kl_h)iHl)Sz4l} #include #include -#include +//#include #include "../jsmn.c" +//#define BUFSIZ 2048 + /* * A small example of jsmn parsing when JSON structure is known and number of * tokens is predictable. @@ -38,12 +40,8 @@ int main() { size_t z; jsmn_parser p; jsmntok_t t[(BUFSIZ/sizeof(jsmntok_t))*2]; /* We expect no more than 128 tokens */ - FILE *fh = fopen("../../../../data/test0.map", "r"); + FILE *fh = fopen("../../../../data/test.map", "r"); char *json_string = malloc(filesize(fh)); - //memset(json_string, 0, sizeof(*json_string)); - //memset(&p, 0, sizeof(p)); - - //printf("\n[[[[%d]]]]\n\n", BUFSIZ); if(fh != NULL) { @@ -53,6 +51,7 @@ int main() { return 3; }*/ //printf("\n%d\n\n", sizeof(*t)); + printf("\n%d", sizeof(*t)); printf("\n%d", sizeof(t)); printf("\n%d\n\n", sizeof(t)/sizeof(t[0])); z = fread(json_string, 1, filesize(fh), fh); @@ -67,6 +66,7 @@ int main() { jsmn_init(&p); r = jsmn_parse(&p, json_string, strlen(json_string), t, sizeof(t)/sizeof(t[0])); + //t[(BUFSIZ/sizeof(jsmntok_t))*2+1].type=JSMN_OBJECT; printf("[\n%s\n]", json_string); printf("[[%d]]\n",r); if (r < 0) { diff --git a/src/lib/jsmn/example/maptest2 b/src/lib/jsmn/example/maptest2 index 4a861d3b24e7cd478e7058d2dd0b58dd5ab37c80..b35d6cda5896f7c70dbe3f8daebafd7dba399b23 100644 GIT binary patch literal 10280 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 literal 10112 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 JB?MdF{{kLD;XVKW diff --git a/src/lib/jsmn/example/maptest2.c b/src/lib/jsmn/example/maptest2.c index 6e18a40d..8d4fec24 100644 --- a/src/lib/jsmn/example/maptest2.c +++ b/src/lib/jsmn/example/maptest2.c @@ -9,6 +9,14 @@ * The output looks like YAML, but I'm not sure if it's really compatible. */ +static int jsoneq(const char *json, jsmntok_t *tok, const char *s) { + if (tok->type == JSMN_STRING && (int) strlen(s) == tok->end - tok->start && + strncmp(json + tok->start, s, tok->end - tok->start) == 0) { + return 0; + } + return -1; +} + static int dump(const char *js, jsmntok_t *t, size_t count, int indent) { int i, j, k; if (count == 0) { @@ -19,12 +27,16 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent) { return 1; } else if (t->type == JSMN_STRING) { printf("'%.*s'", t->end - t->start, js+t->start); + /*if (jsoneq(js, t, "image") == 0) { + printf("- image: %.*s\n", t->end-t->start, + js + t->start); + }*/ return 1; } else if (t->type == JSMN_OBJECT) { printf("\n"); j = 0; for (i = 0; i < t->size; i++) { - for (k = 0; k < indent; k++) printf(" "); + //for (k = 0; k < indent; k++) printf("\t"); j += dump(js, t+1+j, count-j, indent+1); printf(": "); j += dump(js, t+1+j, count-j, indent+1); @@ -35,8 +47,8 @@ static int dump(const char *js, jsmntok_t *t, size_t count, int indent) { j = 0; printf("\n"); for (i = 0; i < t->size; i++) { - for (k = 0; k < indent-1; k++) printf(" "); - printf(" - "); + //for (k = 0; k < indent-1; k++) printf("\t"); + printf("\t-"); j += dump(js, t+1+j, count-j, indent+1); printf("\n"); } @@ -106,6 +118,7 @@ again: } } else { dump(js, tok, p.toknext, 0); + //fprintf(stdout, "[[[[%d]]]]\n", sizeof(tok)); printf("[\n%d\n]", jslen); eof_expected = 1; } -- 2.39.5