Skip to content

Commit 4f08fdc

Browse files
committed
Fix #37: Empty multidimensional arrays are incorrectly serialized
1 parent 6b00cdd commit 4f08fdc

14 files changed

+157
-78
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
.hg/
22
.hgignore
3+
34
*.vip
45
*.aliases
56
*.lvlps
7+
8+
# temp build folder of package builder
9+
.src/

run_tests.vi

6.65 KB
Binary file not shown.

src/JSON Serialization.dragon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,4 +9,4 @@ vipc = "JSON Serialization.vipc"
99
[vipm.dependencies]
1010
oglib_lvdata = "4.2.0.21"
1111
oglib_time = "4.0.1.3"
12-
jki_lib_caraya = "0.4.1.22"
12+
jki_lib_caraya = "1.4.3.147"

src/JSON Serialization.lvproj

Lines changed: 94 additions & 27 deletions
Large diffs are not rendered by default.

src/JSON Serialization.vipb

Lines changed: 14 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<VI_Package_Builder_Settings Version="2018" Created_Date="2016-06-19 12:30:21" Modified_Date="2024-04-17 17:29:13" Creator="Tomi Maila" Comments="" ID="6e309bc5d219a1b2c548085c1050e88c">
1+
<VI_Package_Builder_Settings Version="2018" Created_Date="2016-06-19 12:30:21" Modified_Date="2024-04-17 21:47:48" Creator="Tomi Maila" Comments="" ID="f07feefc4ea56ffa4291288f52beb102">
22
<Library_General_Settings>
33
<Package_File_Name>JKI_lib_json_serialization</Package_File_Name>
4-
<Library_Version>2.0.0.39</Library_Version>
4+
<Library_Version>2.0.1.39</Library_Version>
55
<Auto_Increment_Version>false</Auto_Increment_Version>
66
<Library_Source_Folder>.</Library_Source_Folder>
77
<Library_Output_Folder>..</Library_Output_Folder>
@@ -17,10 +17,11 @@
1717
</Library_General_Settings>
1818
<Advanced_Settings>
1919
<Package_Dependencies>
20+
<External_Dependencies>jki_lib_serialization &gt;= 1.0.1.14</External_Dependencies>
2021
<External_Dependencies>jki_lib_unicode &gt;= 1.0.0.7</External_Dependencies>
2122
<External_Dependencies>oglib_error &gt;= 4.2.0.23</External_Dependencies>
2223
<External_Dependencies>oglib_lvdata &gt;= 4.2.0.21</External_Dependencies>
23-
<Additional_External_Dependencies>jki_lib_serialization &gt;=1.0.1.14</Additional_External_Dependencies>
24+
<Direct_Dependencies>jki_lib_serialization-1.0.1.14</Direct_Dependencies>
2425
<Direct_Dependencies>jki_lib_unicode-1.0.0.7</Direct_Dependencies>
2526
<Direct_Dependencies>oglib_error-4.2.0.23</Direct_Dependencies>
2627
<Direct_Dependencies>oglib_lvdata-4.2.0.21</Direct_Dependencies>
@@ -38,9 +39,13 @@
3839
<One_Line_Description_Summary>JSON serialization and deserialization library for LabVIEW</One_Line_Description_Summary>
3940
<Description>JKI JSON is a serialization and deserialization library for serializing LabVIEW data into JSON strings and deserializing JSON strings into LabVIEW data.</Description>
4041
<Copyright/>
41-
<Packager>Tomi Maila</Packager>
42+
<Packager>JKI</Packager>
4243
<URL>http://jki.net/tools</URL>
43-
<Release_Notes>- Upgraded sources to LabVIEW 2020
44+
<Release_Notes>[2.0.1]
45+
- Fix: Empty multidimensional arrays are incorrectly serialized #37
46+
47+
[2.0.0]
48+
- Upgraded sources to LabVIEW 2020
4449
- Fix: Incorrect indentation when treating cluster as an ordered array #31
4550
- Fix: Deserializing an Array of Cluster of Multi-Dimensional Arrays unnecessarily wraps Inner Array Elements in variants #30
4651
- Fix: Deserializing an Array of Cluster of Clusters unnecessarily wraps Inner Clusters in variants #29
@@ -310,7 +315,7 @@
310315
<Path>Constants and Comparison</Path>
311316
<VI_Title/>
312317
</Items_Data>
313-
<GUID>A8E5C5BDB3048F7D8B3EB9B9FCD4F0F0</GUID>
318+
<GUID>E36B32FCE27D3CC496F989B710055918</GUID>
314319
</Functions_Palette_Data>
315320
<Functions_Palette_Data>
316321
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -499,7 +504,7 @@
499504
<Path>Serializer\JSON Serializer\Write Indent String.vi</Path>
500505
<VI_Title/>
501506
</Items_Data>
502-
<GUID>90D207CB92E1B5447974067119A21AA1</GUID>
507+
<GUID>B3099FB00E9CEFFF67706C2C23016550</GUID>
503508
</Functions_Palette_Data>
504509
<Functions_Palette_Data>
505510
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -576,7 +581,7 @@
576581
<Path>Deserializer\JSON Deserializer\Write Nulls as Defaults.vi</Path>
577582
<VI_Title/>
578583
</Items_Data>
579-
<GUID>4EDCEC29A27CF62B227607CD593AB1C6</GUID>
584+
<GUID>E6B61F6FE0800C3F2F79D0A0CD415E3C</GUID>
580585
</Functions_Palette_Data>
581586
<Functions_Palette_Data>
582587
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -681,7 +686,7 @@
681686
<Path>Library\Is Empty Array.vi</Path>
682687
<VI_Title/>
683688
</Items_Data>
684-
<GUID>DCFD51DDEF723847D0621EFBC5B3CE67</GUID>
689+
<GUID>E3120AD70C655D583BD15668B68449AF</GUID>
685690
</Functions_Palette_Data>
686691
</Library_Palette_Definition>
687692
</VI_Package_Builder_Settings>

src/JSON Serialization.vipc

-6.47 MB
Binary file not shown.

src/Library/Is Empty Array.vi

64 Bytes
Binary file not shown.
-1.74 KB
Binary file not shown.

src/Serializer/JSON Serializer/JSON Serializer.lvclass

Lines changed: 44 additions & 41 deletions
Large diffs are not rendered by default.
Binary file not shown.

0 commit comments

Comments
 (0)