Skip to content

Commit 2fb7a4c

Browse files
Feature/filename in error msg (#39)
* append source path if deserialize error * new support VI "Add Source Path to Error String" in lvlib
1 parent d6be79a commit 2fb7a4c

File tree

12 files changed

+36
-39
lines changed

12 files changed

+36
-39
lines changed

src/Deserializer/JSON Deserializer/JSON Deserializer.lvclass

Lines changed: 31 additions & 32 deletions
Large diffs are not rendered by default.
-952 Bytes
Binary file not shown.
-4.46 KB
Binary file not shown.
Binary file not shown.

src/JKI JSON Serialization.lvlib

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version='1.0' encoding='UTF-8'?>
2-
<Library LVVersion="13008000">
3-
<Property Name="NI.Lib.Icon" Type="Bin">%Q#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!(]!!!*Q(C=\&gt;8"=&gt;MQ%!8143;(8.6"2CVM#WJ",7Q,SN&amp;(N&lt;!NK!7VM#WI"&lt;8A0$%94UZ2$P%E"Y.?G@I%A7=11U&gt;M\7P%FXB^VL\`NHV=@X&lt;^39O0^N(_&lt;8NZOEH@@=^_CM?,3)VK63LD-&gt;8LS%=_]J'0@/1N&lt;XH,7^\SFJ?]Z#5P?=F,HP+5JTTF+5`Z&gt;MB$(P+1)YX*RU2DU$(![)Q3YW.YBG&gt;YBM@8'*\B':\B'2Z&gt;9HC':XC':XD=&amp;M-T0--T0-.DK%USWS(H'2\$2`-U4`-U4`/9-JKH!&gt;JE&lt;?!W#%;UC_WE?:KH?:R']T20]T20]\A=T&gt;-]T&gt;-]T?/7&lt;66[UTQ//9^BIHC+JXC+JXA-(=640-640-6DOCC?YCG)-G%:(#(+4;6$_6)]R?.8&amp;%`R&amp;%`R&amp;)^,WR/K&lt;75?GM=BZUG?Z%G?Z%E?1U4S*%`S*%`S'$;3*XG3*XG3RV320-G40!G3*D6^J-(3D;F4#J,(T\:&lt;=HN+P5FS/S,7ZIWV+7.NNFC&lt;+.&lt;GC0819TX-7!]JVO,(7N29CR6L%7,^=&lt;(1M4#R*IFV][.DX(X?V&amp;6&gt;V&amp;G&gt;V&amp;%&gt;V&amp;\N(L@_Z9\X_TVONVN=L^?Y8#ZR0J`D&gt;$L&amp;]8C-Q_%1_`U_&gt;LP&gt;WWPAG_0NB@$TP@4C`%`KH@[8`A@PRPA=PYZLD8Y!#/7SO!!!!!!</Property>
4-
<Property Name="NI.Lib.SourceVersion" Type="Int">318799872</Property>
2+
<Library LVVersion="20008000">
3+
<Property Name="NI.Lib.Icon" Type="Bin">)!#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!(]!!!*Q(C=\&gt;8"=&gt;MQ%!8143;(8.6"2CVM#WJ",7Q,SN&amp;(N&lt;!NK!7VM#WI"&lt;8A0$%94UZ2$P%E"Y.?G@I%A7=11U&gt;M\7P%FXB^VL\`NHV=@X&lt;^39O0^N(_&lt;8NZOEH@@=^_CM?,3)VK63LD-&gt;8LS%=_]J'0@/1N&lt;XH,7^\SFJ?]Z#5P?=F,HP+5JTTF+5`Z&gt;MB$(P+1)YX*RU2DU$(![)Q3YW.YBG&gt;YBM@8'*\B':\B'2Z&gt;9HC':XC':XD=&amp;M-T0--T0-.DK%USWS(H'2\$2`-U4`-U4`/9-JKH!&gt;JE&lt;?!W#%;UC_WE?:KH?:R']T20]T20]\A=T&gt;-]T&gt;-]T?/7&lt;66[UTQ//9^BIHC+JXC+JXA-(=640-640-6DOCC?YCG)-G%:(#(+4;6$_6)]R?.8&amp;%`R&amp;%`R&amp;)^,WR/K&lt;75?GM=BZUG?Z%G?Z%E?1U4S*%`S*%`S'$;3*XG3*XG3RV320-G40!G3*D6^J-(3D;F4#J,(T\:&lt;=HN+P5FS/S,7ZIWV+7.NNFC&lt;+.&lt;GC0819TX-7!]JVO,(7N29CR6L%7,^=&lt;(1M4#R*IFV][.DX(X?V&amp;6&gt;V&amp;G&gt;V&amp;%&gt;V&amp;\N(L@_Z9\X_TVONVN=L^?Y8#ZR0J`D&gt;$L&amp;]8C-Q_%1_`U_&gt;LP&gt;WWPAG_0NB@$TP@4C`%`KH@[8`A@PRPA=PYZLD8Y!#/7SO!!!!!!</Property>
4+
<Property Name="NI.Lib.SourceVersion" Type="Int">536903680</Property>
55
<Property Name="NI.Lib.Version" Type="Str">1.0.0.0</Property>
66
<Property Name="NI.LV.All.SourceOnly" Type="Bool">true</Property>
77
<Property Name="NI.SortType" Type="Int">3</Property>
@@ -18,6 +18,7 @@
1818
</Item>
1919
<Item Name="JSON Deserializer.lvclass" Type="LVClass" URL="../Deserializer/JSON Deserializer/JSON Deserializer.lvclass"/>
2020
<Item Name="JSON Serializer.lvclass" Type="LVClass" URL="../Serializer/JSON Serializer/JSON Serializer.lvclass"/>
21+
<Item Name="Add Source Path if Error.vi" Type="VI" URL="../Library/Add Source Path if Error.vi"/>
2122
<Item Name="Null Value.vi" Type="VI" URL="../Library/Null Value.vi"/>
2223
<Item Name="Empty Cluster.vi" Type="VI" URL="../Library/Empty Cluster.vi"/>
2324
<Item Name="Empty Array.vi" Type="VI" URL="../Library/Empty Array.vi"/>

src/JSON Serialization.lvproj

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<Item Name="Test Deserialize Timestamps.vi" Type="VI" URL="../../test/Test Deserialize Timestamps.vi"/>
3636
<Item Name="Test Deserialize Null.vi" Type="VI" URL="../../test/Test Deserialize Null.vi"/>
3737
<Item Name="Test Deserialize Null To Defaults.vi" Type="VI" URL="../../test/Test Deserialize Null To Defaults.vi"/>
38-
<Item Name="Test Deserialize.vi" Type="VI" URL="../../test/Test Deserialize.vi"/>
38+
<Item Name="Test Deserialize Source Path.vi" Type="VI" URL="../../test/Test Deserialize Source Path.vi"/>
3939
</Item>
4040
<Item Name="Serialization" Type="Folder">
4141
<Property Name="NI.SortType" Type="Int">3</Property>
@@ -55,7 +55,6 @@
5555
<Item Name="Test Serialize Strings.vi" Type="VI" URL="../../test/Test Serialize Strings.vi"/>
5656
<Item Name="Test Serialize Enum.vi" Type="VI" URL="../../test/Test Serialize Enum.vi"/>
5757
<Item Name="Test Serialize Variants.vi" Type="VI" URL="../../test/Test Serialize Variants.vi"/>
58-
<Item Name="Test Serialize.vi" Type="VI" URL="../../test/Test Serialize.vi"/>
5958
<Item Name="Test Serialize Paths.vi" Type="VI" URL="../../test/Test Serialize Paths.vi"/>
6059
</Item>
6160
<Item Name="RoundTrip" Type="Folder">
@@ -72,7 +71,6 @@
7271
<Item Name="Test GitHub Issue 29 - Deserialize Array of Cluster of Cluster Wraps Elements in Variants.vi" Type="VI" URL="../../test/Test GitHub Issue 29 - Deserialize Array of Cluster of Cluster Wraps Elements in Variants.vi"/>
7372
<Item Name="Test GitHub Issue 30 - Deserialize Array of Cluster of Multi-Dimensional Array Wraps Inner Elements in Variants.vi" Type="VI" URL="../../test/Test GitHub Issue 30 - Deserialize Array of Cluster of Multi-Dimensional Array Wraps Inner Elements in Variants.vi"/>
7473
</Item>
75-
<Item Name="Test JSON Serialization.vi" Type="VI" URL="../../test/Test JSON Serialization.vi"/>
7674
<Item Name="Performance Test.vi" Type="VI" URL="../../test/Performance Test.vi"/>
7775
</Item>
7876
<Item Name="Examples" Type="Folder">
@@ -239,7 +237,6 @@
239237
<Item Name="NI_Data Type.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/Data Type/NI_Data Type.lvlib"/>
240238
<Item Name="Qualified Name Array To Single String.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/LVClass/Qualified Name Array To Single String.vi"/>
241239
</Item>
242-
<Item Name="Test Parse ISO 8601 Timestamps.vi" Type="VI" URL="../../test/Test Parse ISO 8601 Timestamps.vi"/>
243240
</Item>
244241
<Item Name="Build Specifications" Type="Build"/>
245242
</Item>
19.6 KB
Binary file not shown.
-1.3 KB
Binary file not shown.
41.2 KB
Binary file not shown.

test/Test Deserialize.vi

-18.1 KB
Binary file not shown.

0 commit comments

Comments
 (0)