Skip to content

Commit 109cf77

Browse files
author
Tanner Blair
committed
Merge tag '2.1.0.67' into develop
Variants separated out # Conflicts: # Source/JSON Value/Create From Variant/Create From Variant (Numeric).vi # Source/JSON Value/Create From Variant/Create From Variant (String).vi # Source/JSON Value/Variant Support/Cast To Variant/Cast To Variant (Array).vi # Source/JSON Value/Variant Support/Cast To Variant/Cast To Variant (Object).vi # Source/JSON Value/Variant Support/Create From Variant/Create From Variant (Array).vi # Source/JSON Value/Variant Support/Create From Variant/Create From Variant (Boolean).vi # Source/JSON Value/Variant Support/Create From Variant/Create From Variant (Null).vi # Source/JSON Value/Variant Support/Create From Variant/Create From Variant (Numeric).vi # Source/JSON Value/Variant Support/Create From Variant/Create From Variant (Object).vi # Source/JSON Value/Variant Support/Create From Variant/Create From Variant (String).vi # Source/JSON Value/Variant Support/From Variant.vi # Source/JSON Value/Variant Support/JSFL Variant Support.lvlib # Source/JSON Value/Variant Support/To Variant.vi
2 parents 74c9cf5 + 8b36785 commit 109cf77

11 files changed

Lines changed: 19 additions & 39 deletions

‎LVJSON Build Specification.vipb‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<VI_Package_Builder_Settings Version="2017" Created_Date="2017-08-08 12:01:46" Modified_Date="2018-02-01 12:27:25" Creator="tblair" Comments="" ID="5dbff7d1cf29026f06d697b165f8b6d1">
1+
<VI_Package_Builder_Settings Version="2017" Created_Date="2017-08-08 12:01:46" Modified_Date="2018-02-01 18:05:44" Creator="tblair" Comments="" ID="aa89afed0b1a99d2996594660fad5b11">
22
<Library_General_Settings>
33
<Package_File_Name>NI_lib_LVJSON</Package_File_Name>
4-
<Library_Version>2.1.0.67</Library_Version>
4+
<Library_Version>2.1.0.68</Library_Version>
55
<Auto_Increment_Version>false</Auto_Increment_Version>
66
<Library_Source_Folder>Source</Library_Source_Folder>
77
<Library_Output_Folder>Builds</Library_Output_Folder>
@@ -326,7 +326,7 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
326326
<Path>Source\JSON Value\Helper Methods</Path>
327327
<VI_Title/>
328328
</Items_Data>
329-
<GUID>8B05EFBFF96CE411FA9351B3AF908990</GUID>
329+
<GUID>FFC68ECDAF9CCFB0BC3FC0815369DE80</GUID>
330330
</Functions_Palette_Data>
331331
<Functions_Palette_Data>
332332
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -529,7 +529,7 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
529529
<Path>Source\JSON Value\Array\Get Array Values.vi</Path>
530530
<VI_Title/>
531531
</Items_Data>
532-
<GUID>B32E7BBA33490A8F3BCEC101D0DC266A</GUID>
532+
<GUID>D97B0F793B83181F5C2DB9A8256F8459</GUID>
533533
</Functions_Palette_Data>
534534
<Functions_Palette_Data>
535535
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -606,7 +606,7 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
606606
<Path>Source\JSON Value\Object\Remove Value.vi</Path>
607607
<VI_Title/>
608608
</Items_Data>
609-
<GUID>1D46F078ABB309345816B65FF9485620</GUID>
609+
<GUID>B55AA9AAA371ED398A82C478BCAC9CFE</GUID>
610610
</Functions_Palette_Data>
611611
<Functions_Palette_Data>
612612
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -652,7 +652,7 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
652652
<Column>1</Column>
653653
</Position>
654654
<Icon>00000000</Icon>
655-
<Path>Source\JSON Value\Helper Methods\To Variant.vi</Path>
655+
<Path>Source\JSON Value\Variant Support\To Variant.vi</Path>
656656
<VI_Title/>
657657
</Items_Data>
658658
<Items_Data>
@@ -666,7 +666,7 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
666666
<Column>2</Column>
667667
</Position>
668668
<Icon>00000000</Icon>
669-
<Path>Source\JSON Value\Helper Methods\From Variant.vi</Path>
669+
<Path>Source\JSON Value\Variant Support\From Variant.vi</Path>
670670
<VI_Title/>
671671
</Items_Data>
672672
<Items_Data>
@@ -683,7 +683,7 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
683683
<Path>Source\JSON Value\Helper Methods\To File.vi</Path>
684684
<VI_Title/>
685685
</Items_Data>
686-
<GUID>B9C2C6D7F7EAD641319BA394B4F1A7F4</GUID>
686+
<GUID>E927C0E454C92F1ED4893027BF68CBB9</GUID>
687687
</Functions_Palette_Data>
688688
<Functions_Palette_Data>
689689
<Parent_Palette_Index>0</Parent_Palette_Index>
@@ -746,7 +746,7 @@ Simplified API, made all methods static. Added path VIs</Release_Notes>
746746
<Path>Source\JSON Value\By Pointer\Set(path).vi</Path>
747747
<VI_Title/>
748748
</Items_Data>
749-
<GUID>4B17EFDA0C9FAA7C51EBCEC14F4D5678</GUID>
749+
<GUID>7B5162AD2BFF38AA5C8DE3DACB5999B6</GUID>
750750
</Functions_Palette_Data>
751751
</Library_Palette_Definition>
752752
</VI_Package_Builder_Settings>

‎Source/JSON Parsing.lvproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
<Item Name="JSFL Variant Support.lvlib" Type="Library" URL="../JSON Value/Variant Support/JSFL Variant Support.lvlib"/>
1616
<Item Name="Dependencies" Type="Dependencies">
1717
<Item Name="vi.lib" Type="Folder">
18-
<Item Name="NI_Data Type.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/Data Type/NI_Data Type.lvlib"/>
19-
<Item Name="Error Cluster From Error Code.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Error Cluster From Error Code.vi"/>
20-
<Item Name="LVNumericRepresentation.ctl" Type="VI" URL="/&lt;vilib&gt;/numeric/LVNumericRepresentation.ctl"/>
2118
<Item Name="Trim Whitespace.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Trim Whitespace.vi"/>
2219
<Item Name="whitespace.ctl" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/whitespace.ctl"/>
20+
<Item Name="NI_Data Type.lvlib" Type="Library" URL="/&lt;vilib&gt;/Utility/Data Type/NI_Data Type.lvlib"/>
21+
<Item Name="Error Cluster From Error Code.vi" Type="VI" URL="/&lt;vilib&gt;/Utility/error.llb/Error Cluster From Error Code.vi"/>
22+
<Item Name="LVNumericRepresentation.ctl" Type="VI" URL="/&lt;vilib&gt;/Numeric/LVNumericRepresentation.ctl"/>
2323
</Item>
2424
</Item>
2525
<Item Name="Build Specifications" Type="Build"/>

‎Source/JSON Value/JSON Value.lvclass‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,15 +1124,6 @@
11241124
<Property Name="NI.ClassItem.Priority" Type="Int">1</Property>
11251125
<Property Name="NI.ClassItem.State" Type="Int">1082130944</Property>
11261126
</Item>
1127-
<Item Name="cluster to array.vi" Type="VI" URL="../subVIs/cluster to array.vi">
1128-
<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">&amp;A#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!$H!!!!#A!-1#%'=X2B&gt;(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&amp;!!!Q!!!!%!!AFF=H*P=C"P&gt;81!"!!!!!R!5Q&gt;798*J97ZU!"*!1!!"`````Q!&amp;"5&amp;S=G&amp;Z!#"!5!!$!!!!!1!#%W6S=G^S)'FO)#BO&lt;S"F=H*P=CE!$%"4"X:B=GFB&lt;H1!6!$Q!!Q!!Q!%!!1!"A!%!!1!"!!%!!=!"!!%!!A$!!"Y!!!*!!!!!!!!!!!!!!!*!!!!!!!!!!!!!!!!!!!!!!!!!!I!!!!!!!!!!!!!!"!!!!!!!1!*!!!!!!</Property>
1129-
<Property Name="NI.ClassItem.ExecutionSystem" Type="Int">-1</Property>
1130-
<Property Name="NI.ClassItem.Flags" Type="Int">160</Property>
1131-
<Property Name="NI.ClassItem.IsStaticMethod" Type="Bool">true</Property>
1132-
<Property Name="NI.ClassItem.MethodScope" Type="UInt">2</Property>
1133-
<Property Name="NI.ClassItem.Priority" Type="Int">1</Property>
1134-
<Property Name="NI.ClassItem.State" Type="Int">1082130960</Property>
1135-
</Item>
11361127
<Item Name="Delete Helper.vi" Type="VI" URL="../subVIs/Delete Helper.vi">
11371128
<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">&amp;A#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!&amp;=!!!!$!!-1#%'=X2B&gt;(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&amp;!!!Q!!!!%!!AFF=H*P=C"P&gt;81!"!!!!#Z!=!!?!!!5%EJ44UYA6G&amp;M&gt;75O&lt;(:D&lt;'&amp;T=Q!!$EJ44UYA6G&amp;M&gt;75A&lt;X6U!!!A1&amp;!!!Q!!!!%!!B.F=H*P=C"J&lt;C!I&lt;G]A:8*S&lt;X)J!"*!-0````])&lt;'&amp;T&gt;#"L:8E!!"2!-0````]+5'&amp;U;#""=H*B?1!!%E"!!!(`````!!A&amp;18*S98E!,%"Q!"Y!!"133F.04C"797RV:3ZM&gt;G.M98.T!!!.3F.04C"797RV:3"J&lt;A"B!0!!$!!$!!1!"!!&amp;!!1!"!!%!!1!"A!(!!E!#A-!!(A!!!U)!!!!!!!!!!!!!!U,!!!!!!!!!!!!!!!!!!!!!!!!#A!!!"!!!!%3!!!!%A!!$1!!!!Q!!!!!!!!!!!!!!1!,!!!!!!</Property>
11381129
<Property Name="NI.ClassItem.ExecutionSystem" Type="Int">-1</Property>
@@ -1187,15 +1178,6 @@
11871178
<Property Name="NI.ClassItem.Priority" Type="Int">1</Property>
11881179
<Property Name="NI.ClassItem.State" Type="Int">34078738</Property>
11891180
</Item>
1190-
<Item Name="get all paths in variant.vi" Type="VI" URL="../subVIs/get all paths in variant.vi">
1191-
<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">&amp;A#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!%&amp;!!!!$!!-1#%'=X2B&gt;(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&amp;!!!Q!!!!%!!AFF=H*P=C"P&gt;81!"!!B!":!1!!"`````Q!%#8.U=H6D&gt;(6S:1!11$$`````"F.U=GFO:Q!!%E"!!!(`````!!9&amp;='&amp;U;(-!"!!!!#"!5!!$!!!!!1!#%W6S=G^S)'FO)#BO&lt;S"F=H*P=CE!$%"4"V:B=GFB&lt;H1!6!$Q!!Q!!Q!&amp;!!=!#!!)!!A!#!!)!!E!#!!)!!I$!!"Y!!!.#!!!#1!!!!E!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!I!!!!!!!!!!!!!!!I!!!!!!1!,!!!!!!</Property>
1192-
<Property Name="NI.ClassItem.ExecutionSystem" Type="Int">-1</Property>
1193-
<Property Name="NI.ClassItem.Flags" Type="Int">0</Property>
1194-
<Property Name="NI.ClassItem.IsStaticMethod" Type="Bool">true</Property>
1195-
<Property Name="NI.ClassItem.MethodScope" Type="UInt">2</Property>
1196-
<Property Name="NI.ClassItem.Priority" Type="Int">1</Property>
1197-
<Property Name="NI.ClassItem.State" Type="Int">1082130960</Property>
1198-
</Item>
11991181
<Item Name="get array data.vi" Type="VI" URL="../subVIs/get array data.vi">
12001182
<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">&amp;A#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!%R!!!!#A!-1#%'=X2B&gt;(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&amp;!!!Q!!!!%!!AFF=H*P=C"P&gt;81!"!!!!#R!=!!?!!!5%EJ44UYA6G&amp;M&gt;75O&lt;(:D&lt;'&amp;T=Q!!$5J44UYA18*S98EA;7Y!(%"!!!(`````!!5/3F.04C""=H*B?3"P&gt;81!!#"!5!!$!!!!!1!#%W6S=G^S)'FO)#BO&lt;S"F=H*P=CE!,%"Q!"Y!!"133F.04C"797RV:3ZM&gt;G.M98.T!!!.3F.04C"797RV:3"J&lt;A"5!0!!$!!$!!1!"!!'!!1!"!!%!!1!"Q!%!!1!#!)!!(A!!!U)!!!!!!!!!!!!!!E!!!!!!!!!!!!!!!!!!!!!!!!!#A!!!!!!!!!!!!!!%!!!!!!"!!E!!!!!</Property>
12011183
<Property Name="NI.ClassItem.ExecutionSystem" Type="Int">-1</Property>
@@ -1205,15 +1187,6 @@
12051187
<Property Name="NI.ClassItem.Priority" Type="Int">1</Property>
12061188
<Property Name="NI.ClassItem.State" Type="Int">8388608</Property>
12071189
</Item>
1208-
<Item Name="get paths in variant helper.vi" Type="VI" URL="../subVIs/get paths in variant helper.vi">
1209-
<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">&amp;A#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!%=!!!!$A!-1#%'=X2B&gt;(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&amp;!!!Q!!!!%!!AFF=H*P=C"P&gt;81!"!!B!":!1!!"`````Q!%#8.U=H6D&gt;(6S:1!)!$$`````!"*!1!!"`````Q!'"8"B&gt;'BT!!1!!!!A1&amp;!!!Q!!!!%!!B.F=H*P=C"J&lt;C!I&lt;G]A:8*S&lt;X)J!!N!!Q!&amp;;7ZE:8A!&amp;%!Q`````QN198*F&lt;H1A4G&amp;N:1!-1&amp;-(&gt;G&amp;S;7&amp;O&gt;!"5!0!!$!!$!!5!"Q!)!!A!#!!)!!A!#1!+!!M!$!-!!(A!!!U)!!!*!!!!#1!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!#A!!!"!!!!%+!!!!%A!!!!!"!!U!!!!!</Property>
1210-
<Property Name="NI.ClassItem.ExecutionSystem" Type="Int">-1</Property>
1211-
<Property Name="NI.ClassItem.Flags" Type="Int">16777344</Property>
1212-
<Property Name="NI.ClassItem.IsStaticMethod" Type="Bool">true</Property>
1213-
<Property Name="NI.ClassItem.MethodScope" Type="UInt">2</Property>
1214-
<Property Name="NI.ClassItem.Priority" Type="Int">1</Property>
1215-
<Property Name="NI.ClassItem.State" Type="Int">1115685392</Property>
1216-
</Item>
12171190
<Item Name="LookAhead.vi" Type="VI" URL="../subVIs/LookAhead.vi">
12181191
<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">&amp;A#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!'Q!!!!$!!-1#%'=X2B&gt;(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&amp;!!!Q!!!!%!!AFF=H*P=C"P&gt;81!H1$R!!!!!!!!!!)33F.04C"797RV:3ZM&gt;G.M98.T$F2P;W6O)&amp;2Z='5O9X2M!(.!&amp;A!-"%Z04E5+1V634&amp;F@4V"&amp;4AN$66*-76^$4%^421R4566"5E6%8U^125Y.5V&amp;616*&amp;2&amp;^$4%^4216$4UR04A6$4UV.11:46&amp;**4E='4F6.1E63"&amp;23655&amp;2E&amp;-5U5%4F6-4!!!"6203U6/!"&gt;!!Q!237ZE:8AA5'&amp;T=X2I=G^V:WA!)%!Q`````R&gt;+5U^/)&amp;.U=GFO:S"198.T&gt;'BS&lt;X6H;!!%!!!!)%"1!!-!!!!"!!)4:8*S&lt;X)A;7YA+'ZP)'6S=G^S+1!,1!-!"5FO:'6Y!"2!-0````],3F.04C"4&gt;(*J&lt;G=!6!$Q!!Q!!Q!%!!5!"A!(!!=!"Q!(!!A!"Q!*!!I#!!"Y!!!.#!!!#1!!!!U+!!!.#Q!!!!!!!!!!!!!!!!!!!!!!!!A!!!!!!!!!#!!!!!A!!!!!!1!,!!!!!!</Property>
12191192
<Property Name="NI.ClassItem.ExecutionSystem" Type="Int">-1</Property>

‎Source/JSON Value/Variant Support/Create From Variant/Create From Variant (Numeric).vi~2.1.0.67‎

24.8 KB
Binary file not shown.

Source/JSON Value/Variant Support/Create From Variant/Create From Variant (Numeric).vi renamed to Source/JSON Value/Variant Support/Create From Variant/Create From Variant (Numeric).vi~HEAD

File renamed without changes.

‎Source/JSON Value/Variant Support/Create From Variant/Create From Variant (String).vi~2.1.0.67‎

24.8 KB
Binary file not shown.

Source/JSON Value/Variant Support/Create From Variant/Create From Variant (String).vi renamed to Source/JSON Value/Variant Support/Create From Variant/Create From Variant (String).vi~HEAD

File renamed without changes.

‎Source/JSON Value/Variant Support/JSFL Variant Support.lvlib‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,13 @@
1616
<Item Name="Create From Variant (Object).vi" Type="VI" URL="../Create From Variant/Create From Variant (Object).vi"/>
1717
<Item Name="Create From Variant (String).vi" Type="VI" URL="../Create From Variant/Create From Variant (String).vi"/>
1818
</Item>
19+
<<<<<<< HEAD
1920
<Item Name="From Variant.vi" Type="VI" URL="../From Variant.vi"/>
21+
=======
22+
<Item Name="cluster to array.vi" Type="VI" URL="../cluster to array.vi"/>
23+
<Item Name="From Variant.vi" Type="VI" URL="../From Variant.vi"/>
24+
<Item Name="get all paths in variant.vi" Type="VI" URL="../get all paths in variant.vi"/>
25+
<Item Name="get paths in variant helper.vi" Type="VI" URL="../get paths in variant helper.vi"/>
26+
>>>>>>> 2.1.0.67
2027
<Item Name="To Variant.vi" Type="VI" URL="../To Variant.vi"/>
2128
</Library>

Source/JSON Value/subVIs/cluster to array.vi renamed to Source/JSON Value/Variant Support/cluster to array.vi

16.8 KB
Binary file not shown.

Source/JSON Value/subVIs/get all paths in variant.vi renamed to Source/JSON Value/Variant Support/get all paths in variant.vi

16.2 KB
Binary file not shown.

0 commit comments

Comments
 (0)