Skip to content

Commit 650b5ec

Browse files
fangqfangq
committed
enable preencode by default for savejson and saveubjson
1 parent 0f870c0 commit 650b5ec

File tree

8 files changed

+70
-67
lines changed

8 files changed

+70
-67
lines changed

‎examples/jsonlab_basictest.matlab‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ ans =
191191

192192
[
193193
"a",
194-
1,
194+
true,
195195
[
196196
[2],
197197
[3]
@@ -1242,6 +1242,7 @@ ans =
12421242
"Names",
12431243
"Age"
12441244
],
1245+
"_TableRows_": [],
12451246
"_TableRecords_": [
12461247
[
12471248
"Andy",
@@ -1255,8 +1256,7 @@ ans =
12551256
"Om",
12561257
22
12571258
]
1258-
],
1259-
"_TableRows_": []
1259+
]
12601260
}
12611261
}
12621262

‎examples/jsonlab_selftest.matlab‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@
138138
139139
>> >> ===============================================
140140
>> example1.json
141-
{Udata{U firstNameSUJohnUlastNameSUSmithUageiUaddress{UstreetAddressSU21 2nd StreetUcitySUNew YorkUstateSUNYU
141+
{Udata{U firstNameSUJohnUlastNameSUSmithUageUUaddress{UstreetAddressSU21 2nd StreetUcitySUNew YorkUstateSUNYU
142142
postalCodeSU10021}U phoneNumber[{UtypeSUhomeUnumberSU 212 555-1234}{UtypeSUfaxUnumberSU 646 555-4567}]}}
143143
===============================================
144144
>> example2.json
@@ -150,5 +150,5 @@ GlossEntry{UIDSUSGMLUSortAsSUSGMLU GlossTermSU$Standard Generalized Markup L
150150
CloseDoc()}]}}}}
151151
===============================================
152152
>> example4.json
153-
{Udata[{Usample{Urhoi}}{Usample{Urhoi}}[[$i#U[$i#U[$i#U][SUPaperSUScissorsSUStone][CaSUb\SUc"SUd\"SUe"[SUf\"[SUg[\SUh[\"]]}
153+
{Udata[{Usample{UrhoU}}{Usample{UrhoU}}[[$U#U[$U#U[$U#U][SUPaperSUScissorsSUStone][CaSUb\SUc"SUd\"SUe"[SUf\"[SUg[\SUh[\"]]}
154154
>>

‎examples/jsonlab_ubjson_basictest.matlab‎

Lines changed: 29 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ data2json =
8585
>>
8686
ans =
8787

88-
[$i#U
88+
[$U#U
8989

9090
>>
9191
json2data =
@@ -107,7 +107,7 @@ data2json =
107107
>>
108108
ans =
109109

110-
[$i#[$U#U
110+
[$U#[$U#U
111111

112112
>>
113113
json2data =
@@ -172,12 +172,12 @@ data2json =
172172
>>
173173
ans =
174174

175-
[CaT[$i#[$U#U]
175+
[CaT[$U#[$U#U]
176176

177177
>>
178178
json2data =
179179

180-
'a' [1] [2x1 int8]
180+
'a' [1] [2x1 uint8]
181181

182182
>> >>
183183
%=================================================
@@ -187,8 +187,8 @@ json2data =
187187
>> >> >>
188188
ans =
189189

190-
[[[ii iii!i)][iiiii#i+][iiiii%i-][iiiii'i/]][[ii
191-
iii"i*][iiiii$i,][iiiii&i.][iiii i(i0]]]
190+
[[[UU UUU!U)][UUUUU#U+][UUUUU%U-][UUUUU'U/]][[UU
191+
UUU"U*][UUUUU$U,][UUUUU&U.][UUUU U(U0]]]
192192

193193
>>
194194
json2data =
@@ -203,7 +203,7 @@ json2data =
203203
>> >> >>
204204
ans =
205205

206-
{U_ArrayType_SUdoubleU_ArraySize_[$U#UU_ArrayData_[$i#U0 !)#+%-'/
206+
{U_ArrayType_SUdoubleU_ArraySize_[$U#UU_ArrayData_[$U#U0 !)#+%-'/
207207
"* $,&. (0}
208208

209209
>>
@@ -250,7 +250,7 @@ json2data(:,:,6) =
250250
>> >> >>
251251
ans =
252252

253-
{U_ArrayType_SUdoubleU_ArraySize_[$U#UU_ArrayData_[$i#U0 !)#+%-'/
253+
{U_ArrayType_SUdoubleU_ArraySize_[$U#UU_ArrayData_[$U#U0 !)#+%-'/
254254
"* $,&. (0}
255255
256256
>>
@@ -297,8 +297,8 @@ json2data(:,:,3,2) =
297297
>> >> >>
298298
ans =
299299
300-
[[[ii][ii][ii][ii]][[i i
301-
][ii][ii][ii]][[ii][ii][ii][ii]][[ii][ii][ii][ii ]][[i!i"][i#i$][i%i&][i'i(]][[i)i*][i+i,][i-i.][i/i0]]]
300+
[[[UU][UU][UU][UU]][[U U
301+
][UU][UU][UU]][[UU][UU][UU][UU]][[UU][UU][UU][UU ]][[U!U"][U#U$][U%U&][U'U(]][[U)U*][U+U,][U-U.][U/U0]]]
302302

303303
>> >>
304304
%=================================================
@@ -308,7 +308,7 @@ ans =
308308
>> >> >>
309309
ans =
310310

311-
{U_ArrayType_SUdoubleU_ArraySize_[$U#UU_ArrayData_[$i#U0
311+
{U_ArrayType_SUdoubleU_ArraySize_[$U#UU_ArrayData_[$U#U0
312312
 !"#$%&'()*+,-./0}
313313

314314
>> >>
@@ -324,7 +324,7 @@ data2json =
324324
>>
325325
ans =
326326

327-
{U_ArrayType_SUdoubleU_ArraySize_[$U#UU_ArrayIsComplex_TU_ArrayData_[$i#[$U#U}
327+
{U_ArrayType_SUdoubleU_ArraySize_[$U#UU_ArrayIsComplex_TU_ArrayData_[$U#[$U#U}
328328

329329
>>
330330
json2data =
@@ -349,7 +349,7 @@ data2json =
349349
>>
350350
ans =
351351

352-
{U_ArrayType_SUdoubleU_ArraySize_[$U#UU_ArrayIsComplex_TU_ArrayData_[$i#[$U#U#
352+
{U_ArrayType_SUdoubleU_ArraySize_[$U#UU_ArrayIsComplex_TU_ArrayData_[$U#[$U#U#
353353
! "$ }
354354

355355
>>
@@ -405,13 +405,7 @@ ans =
405405

406406
{Usparse{U _ArrayType_SUdoubleU _ArraySize_[$U#U
407407

408-
U_ArrayIsSparse_TU _ArrayData_[[$i#U  
409-
410-

411-
[$i#U 
412-
413-
414-
[$D#U ?äûÓë12?è?h:öl;?ë,8Ù±?çǽ½æ'#?Ù?[`o€?å¸2ɘNé?¢HÍpà?íãEι¶P?äù¬Ä² ¶]}}
408+
U_ArrayIsSparse_TU _ArrayData_[$D#[$U#U ?ð @ ?äûÓë12@" @ ?è?h:öl;@ @ ?ë,8Ù±@$ @ ?çǽ½æ'#@$ @ ?Ù?[`o€@ @" ?å¸2ɘNé@ @$ ?¢HÍpà@ @$ ?íãEι¶P@$ @$ ?äù¬Ä² ¶}}
415409

416410
>>
417411
json2data =
@@ -441,13 +435,7 @@ ans =
441435

442436
{Ucomplex_sparse{U _ArrayType_SUdoubleU _ArraySize_[$U#U
443437

444-
U_ArrayIsComplex_TU_ArrayIsSparse_TU _ArrayData_[[$i#U  
445-
446-

447-
[$i#U 
448-
449-
450-
[$D#U ?äûÓë12?è?h:öl;?ë,8Ù±?çǽ½æ'#?Ù?[`o€?å¸2ɘNé?¢HÍpà?íãEι¶P?äù¬Ä² ¶[$D#U ¿äûÓë12¿è?h:öl;¿ë,8Ù±¿çǽ½æ'#¿Ù?[`o€¿å¸2ɘNé¿¢HÍpà¿íãEι¶P¿äù¬Ä² ¶]}}
438+
U_ArrayIsComplex_TU_ArrayIsSparse_TU _ArrayData_[$D#[$U#U ?ð @ ?äûÓë12¿äûÓë12@" @ ?è?h:öl;¿è?h:öl;@ @ ?ë,8Ù±¿ë,8Ù±@$ @ ?çǽ½æ'#¿çǽ½æ'#@$ @ ?Ù?[`o€¿Ù?[`o€@ @" ?å¸2ɘNé¿å¸2ɘNé@ @$ ?¢HÍpà¿¢HÍpà@ @$ ?íãEι¶P¿íãEι¶P@$ @$ ?äù¬Ä² ¶¿äù¬Ä² ¶}}
451439

452440
>>
453441
json2data =
@@ -462,7 +450,7 @@ json2data =
462450
>> >> >>
463451
ans =
464452

465-
{Uall_zero_sparse{U_ArrayType_SUdoubleU_ArraySize_[$U#UU_ArrayIsSparse_TU_ArrayData_[ZZZ]}}
453+
{Uall_zero_sparse{U_ArrayType_SUdoubleU_ArraySize_[$U#UU_ArrayIsSparse_TU_ArrayData_Z}}
466454

467455
>>
468456
json2data =
@@ -522,7 +510,7 @@ json2data =
522510
>> >> >>
523511
ans =
524512

525-
{Usparse_column_vector{U_ArrayType_SUdoubleU_ArraySize_[$U#UU_ArrayIsSparse_TU_ArrayData_[[$i#U[$i#U]}}
513+
{Usparse_column_vector{U_ArrayType_SUdoubleU_ArraySize_[$U#UU_ArrayIsSparse_TU_ArrayData_[$U#[$U#U}}
526514

527515
>>
528516
json2data =
@@ -537,7 +525,7 @@ json2data =
537525
>> >> >>
538526
ans =
539527

540-
{Ucomplex_sparse_column_vector{U_ArrayType_SUdoubleU_ArraySize_[$U#UU_ArrayIsComplex_TU_ArrayIsSparse_TU_ArrayData_[[$i#U[$i#U[$i#Uýÿü]}}
528+
{Ucomplex_sparse_column_vector{U_ArrayType_SUdoubleU_ArraySize_[$U#UU_ArrayIsComplex_TU_ArrayIsSparse_TU_ArrayData_[$i#[$U#Uýÿü}}
541529

542530
>>
543531
json2data =
@@ -552,7 +540,7 @@ json2data =
552540
>> >> >>
553541
ans =
554542

555-
{Usparse_row_vector{U_ArrayType_SUdoubleU_ArraySize_[$U#UU_ArrayIsSparse_TU_ArrayData_[[$i#U[$i#U]}}
543+
{Usparse_row_vector{U_ArrayType_SUdoubleU_ArraySize_[$U#UU_ArrayIsSparse_TU_ArrayData_[$U#[$U#U}}
556544

557545
>>
558546
json2data =
@@ -567,7 +555,7 @@ json2data =
567555
>> >> >>
568556
ans =
569557

570-
{Ucomplex_sparse_row_vector{U_ArrayType_SUdoubleU_ArraySize_[$U#UU_ArrayIsComplex_TU_ArrayIsSparse_TU_ArrayData_[[$i#U[$i#U[$i#Uýÿü]}}
558+
{Ucomplex_sparse_row_vector{U_ArrayType_SUdoubleU_ArraySize_[$U#UU_ArrayIsComplex_TU_ArrayIsSparse_TU_ArrayData_[$i#[$U#Uýÿü}}
571559

572560
>>
573561
json2data =
@@ -591,7 +579,7 @@ data2json =
591579
>>
592580
ans =
593581

594-
{Uastruct{UnameSUThink DifferentUyearIÍUmagic[$i#[$U#U Umisfits[$D#Uð ÿø Uembedded{UleftTUrightF}}}
582+
{Uastruct{UnameSUThink DifferentUyearIÍUmagic[$U#[$U#U Umisfits[$D#Uð ÿø Uembedded{UleftTUrightF}}}
595583

596584
>>
597585
json2data =
@@ -611,7 +599,7 @@ logical
611599
>> >> >> >> >>
612600
ans =
613601

614-
{USupreme Commander[{UnameSUNexus PrimeUranki }{UnameSUSentinel PrimeUranki }{UnameSUOptimus PrimeUranki }]}
602+
{USupreme Commander[{UnameSUNexus PrimeUrankU }{UnameSUSentinel PrimeUrankU }{UnameSUOptimus PrimeUrankU }]}
615603

616604
>>
617605
json2data =
@@ -633,7 +621,7 @@ data2json =
633621
>>
634622
ans =
635623

636-
{Udebian[[{UbuzzD?ñ™™™™™šUrexD?ó333333UboD?ôÌÌÌÌÌÍUhammiUslinkD@ ÌÌÌÌÌÍUpotatoD@™™™™™šUwoodyiUsargeD@ÌÌÌÌÌÍUetchiUlennyiUsqueezeiUwheezyi}{UUbuntu[SUKubuntuSUXubuntuSULubuntu]}[$D#U@$záG®@$333333@&záG®@&333333]]}
624+
{Udebian[[{UbuzzD?ñ™™™™™šUrexD?ó333333UboD?ôÌÌÌÌÌÍUhammUUslinkD@ ÌÌÌÌÌÍUpotatoD@™™™™™šUwoodyUUsargeD@ÌÌÌÌÌÍUetchUUlennyUUsqueezeUUwheezyU}{UUbuntu[SUKubuntuSUXubuntuSULubuntu]}[$D#U@$záG®@$333333@&záG®@&333333]]}
637625

638626
>>
639627
json2data =
@@ -651,7 +639,7 @@ json2data =
651639
ValidName: 1
652640
x0x5F_InvalidName: 2
653641
x0x3A_Field_0x3A_: 3
654-
x0xEFBFBD__0xEFBFBD_: '绝密'
642+
x0xE9A1B9__0xE79BAE_: '绝密'
655643

656644
>> >>
657645
%=================================================
@@ -681,7 +669,7 @@ json2data =
681669
>> >> >>
682670
ans =
683671

684-
{U data2json[[[[i][[i][i]]][[i][i]][[i]]][[[i]][[i][i ]][[i
672+
{U data2json[[[[U][[U][U]]][[U][U]][[U]]][[[U]][[U][U ]][[U
685673
]]]]}
686674

687675
>>
@@ -705,7 +693,7 @@ data2json =
705693
>> >>
706694
ans =
707695

708-
{U data2json[[{UidxiUdataSUstructs}{UidxiUdataSUstructs}][{UidxiUdataSUstructs}{UidxiUdataSUstructs}][{UidxiUdataSUstructs}{UidxiUdataSUstructs}]]}
696+
{U data2json[[{UidxUUdataSUstructs}{UidxUUdataSUstructs}][{UidxUUdataSUstructs}{UidxUUdataSUstructs}][{UidxUUdataSUstructs}{UidxUUdataSUstructs}]]}
709697

710698
>>
711699
json2data =
@@ -725,7 +713,7 @@ data2json =
725713

726714
ans =
727715

728-
[{UFormatSUdd-MMM-uuuuUTimeZoneSU UYearIßUMonthiUDayiUHouri UMinutei USecondi USystemTimeZoneSUAmerica/New_York}{UFormatSUdd-MMM-uuuuUTimeZoneSU UYearIßUMonthiUDayi UHouri UMinutei USecondi USystemTimeZoneSUAmerica/New_York}]
716+
[{UFormatSUdd-MMM-uuuuUTimeZoneSU UYearIßUMonthUUDayUUHourU UMinuteU USecondU USystemTimeZoneSUAmerica/New_York}{UFormatSUdd-MMM-uuuuUTimeZoneSU UYearIßUMonthUUDayU UHourU UMinuteU USecondU USystemTimeZoneSUAmerica/New_York}]
729717

730718

731719
json2data =
@@ -749,7 +737,7 @@ data2json =
749737

750738
ans =
751739

752-
{UAndyiUOmiUWilliami}
740+
{UAndyUUOmUUWilliamU}
753741

754742

755743
json2data =
@@ -776,7 +764,7 @@ data2json =
776764

777765
ans =
778766

779-
{Utable{U_TableCols_[SUNamesSUAge]U_TableRecords_[[SUAndy[i]][SUWilliam[i]][SUOm[i]]]U_TableRows_Z}}
767+
{Utable{U_TableCols_[SUNamesSUAge]U_TableRows_ZU_TableRecords_[[SUAndy[U]][SUWilliam[U]][SUOm[U]]]}}
780768

781769

782770
json2data =

‎fast_match_bracket.m‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,4 +56,4 @@
5656
flag=cumsum(count==brackets(1))-cumsum(count==brackets(2))+1;
5757
endpos = find(flag==0,1);
5858
maxlevel=max([1,max(flag(1:endpos))]);
59-
endpos = pos(endpos + startpos-1);
59+
endpos = pos(endpos + startpos-1);

0 commit comments

Comments
 (0)