Skip to content

Commit

Permalink
various bug fixes
Browse files Browse the repository at this point in the history 
added examples
updated to 2016
  • Loading branch information
Tanner Blair committed Jan 13, 2018
1 parent e1ce059 commit a1b5149
Show file tree
Hide file tree
Showing 28 changed files with 93 additions and 97 deletions.
60 changes: 16 additions & 44 deletions LVJSON Build Specification.vipb
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<VI_Package_Builder_Settings Version="2017" Created_Date="2017-08-08 12:01:46" Modified_Date="2017-12-11 10:41:11" Creator="tblair" Comments="" ID="0c854ef81cd79b74b5fdf336c3b64a83">
<VI_Package_Builder_Settings Version="2017" Created_Date="2017-08-08 12:01:46" Modified_Date="2018-01-12 10:54:02" Creator="tblair" Comments="" ID="86b5309f476f7622d51abe8fa1f150d2">
<Library_General_Settings>
<Package_File_Name>NI_lib_LVJSON</Package_File_Name>
<Library_Version>1.0.0.58</Library_Version>
Expand Down Expand Up @@ -32,7 +32,7 @@
<Copyright/>
<Packager>NI Systems Engineering</Packager>
<URL/>
<Release_Notes/>
<Release_Notes>Removed XNodes. They aren't stable yet.</Release_Notes>
</Description>
<Destinations>
<Toolkit_VIs>
Expand Down Expand Up @@ -390,7 +390,7 @@
<Path>Source\Object</Path>
<VI_Title/>
</Items_Data>
<GUID>E8837888302FB2CE28535B24BF4F83BF</GUID>
<GUID>7216BF1E874A0B47DC7DC9F860A49067</GUID>
</Functions_Palette_Data>
<Functions_Palette_Data>
<Parent_Palette_Index>0</Parent_Palette_Index>
Expand Down Expand Up @@ -568,53 +568,53 @@
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
<NameSub_Menu_Name>Build JSON Array.xnode</NameSub_Menu_Name>
<NameSub_Menu_Name>Get Array Values.vi</NameSub_Menu_Name>
<Short_Name/>
<is_Merge_VI>false</is_Merge_VI>
<Position>
<Row>2</Row>
<Column>2</Column>
<Row>3</Row>
<Column>5</Column>
</Position>
<Icon>00000000</Icon>
<Path>Source\JSON Data Classes\JSON Array\Build Array XNode\Build JSON Array.xnode</Path>
<Path>Source\JSON Data Classes\JSON Array\Get Array Values.vi</Path>
<VI_Title/>
</Items_Data>
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
<NameSub_Menu_Name>Index JSON Array.xnode</NameSub_Menu_Name>
<NameSub_Menu_Name>Index Array.vi</NameSub_Menu_Name>
<Short_Name/>
<is_Merge_VI>false</is_Merge_VI>
<Position>
<Row>1</Row>
<Column>3</Column>
</Position>
<Icon>00000000</Icon>
<Path>Source\JSON Data Classes\JSON Array\Index Array XNode\Index JSON Array.xnode</Path>
<Path>Source\JSON Data Classes\JSON Array\Index Array.vi</Path>
<VI_Title/>
</Items_Data>
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
<NameSub_Menu_Name>Get Array Values.vi</NameSub_Menu_Name>
<NameSub_Menu_Name>Build Array.vi</NameSub_Menu_Name>
<Short_Name/>
<is_Merge_VI>false</is_Merge_VI>
<Position>
<Row>3</Row>
<Column>5</Column>
<Row>2</Row>
<Column>2</Column>
</Position>
<Icon>00000000</Icon>
<Path>Source\JSON Data Classes\JSON Array\Get Array Values.vi</Path>
<Path>Source\JSON Data Classes\JSON Array\Build Array.vi</Path>
<VI_Title/>
</Items_Data>
<GUID>0BCEEF2F36AF834613D93850B4FEED95</GUID>
<GUID>D746CD43DA91180B24412B79D34F2632</GUID>
</Functions_Palette_Data>
<Functions_Palette_Data>
<Parent_Palette_Index>0</Parent_Palette_Index>
<Name>Object</Name>
<View_Format>Icons</View_Format>
<Size>
<Height_Row>2</Height_Row>
<Height_Row>1</Height_Row>
<Width_Col.>5</Width_Col.>
</Size>
<_256_Color_Icon>00000CA0002800000C9A00000400000000000020002000080000000000FFFFFF00FF80000000FFFFFFFFFFFF0000FFFFFFFFCCCC0000FFFFFFFF99990000FFFFFFFF66660000FFFFFFFF33330000FFFFFFFF00000000FFFFCCCCFFFF0000FFFFCCCCCCCC0000FFFFCCCC99990000FFFFCCCC66660000FFFFCCCC33330000FFFFCCCC00000000FFFF9999FFFF0000FFFF9999CCCC0000FFFF999999990000FFFF999966660000FFFF999933330000FFFF999900000000FFFF6666FFFF0000FFFF6666CCCC0000FFFF666699990000FFFF666666660000FFFF666633330000FFFF666600000000FFFF3333FFFF0000FFFF3333CCCC0000FFFF333399990000FFFF333366660000FFFF333333330000FFFF333300000000FFFF0000FFFF0000FFFF0000CCCC0000FFFF000099990000FFFF000066660000FFFF000033330000FFFF000000000000CCCCFFFFFFFF0000CCCCFFFFCCCC0000CCCCFFFF99990000CCCCFFFF66660000CCCCFFFF33330000CCCCFFFF00000000CCCCCCCCFFFF0000CCCCCCCCCCCC0000CCCCCCCC99990000CCCCCCCC66660000CCCCCCCC33330000CCCCCCCC00000000CCCC9999FFFF0000CCCC9999CCCC0000CCCC999999990000CCCC999966660000CCCC999933330000CCCC999900000000CCCC6666FFFF0000CCCC6666CCCC0000CCCC666699990000CCCC666666660000CCCC666633330000CCCC666600000000CCCC3333FFFF0000CCCC3333CCCC0000CCCC333399990000CCCC333366660000CCCC333333330000CCCC333300000000CCCC0000FFFF0000CCCC0000CCCC0000CCCC000099990000CCCC000066660000CCCC000033330000CCCC0000000000009999FFFFFFFF00009999FFFFCCCC00009999FFFF999900009999FFFF666600009999FFFF333300009999FFFF000000009999CCCCFFFF00009999CCCCCCCC00009999CCCC999900009999CCCC666600009999CCCC333300009999CCCC0000000099999999FFFF000099999999CCCC0000999999999999000099999999666600009999999933330000999999990000000099996666FFFF000099996666CCCC0000999966669999000099996666666600009999666633330000999966660000000099993333FFFF000099993333CCCC0000999933339999000099993333666600009999333333330000999933330000000099990000FFFF000099990000CCCC000099990000999900009999000066660000999900003333000099990000000000006666FFFFFFFF00006666FFFFCCCC00006666FFFF999900006666FFFF666600006666FFFF333300006666FFFF000000006666CCCCFFFF00006666CCCCCCCC00006666CCCC999900006666CCCC666600006666CCCC333300006666CCCC0000000066669999FFFF000066669999CCCC0000666699999999000066669999666600006666999933330000666699990000000066666666FFFF000066666666CCCC0000666666669999000066666666666600006666666633330000666666660000000066663333FFFF000066663333CCCC0000666633339999000066663333666600006666333333330000666633330000000066660000FFFF000066660000CCCC000066660000999900006666000066660000666600003333000066660000000000003333FFFFFFFF00003333FFFFCCCC00003333FFFF999900003333FFFF666600003333FFFF333300003333FFFF000000003333CCCCFFFF00003333CCCCCCCC00003333CCCC999900003333CCCC666600003333CCCC333300003333CCCC0000000033339999FFFF000033339999CCCC0000333399999999000033339999666600003333999933330000333399990000000033336666FFFF000033336666CCCC0000333366669999000033336666666600003333666633330000333366660000000033333333FFFF000033333333CCCC0000333333339999000033333333666600003333333333330000333333330000000033330000FFFF000033330000CCCC000033330000999900003333000066660000333300003333000033330000000000000000FFFFFFFF00000000FFFFCCCC00000000FFFF999900000000FFFF666600000000FFFF333300000000FFFF000000000000CCCCFFFF00000000CCCCCCCC00000000CCCC999900000000CCCC666600000000CCCC333300000000CCCC0000000000009999FFFF000000009999CCCC0000000099999999000000009999666600000000999933330000000099990000000000006666FFFF000000006666CCCC0000000066669999000000006666666600000000666633330000000066660000000000003333FFFF000000003333CCCC0000000033339999000000003333666600000000333333330000000033330000000000000000FFFF000000000000CCCC0000000000009999000000000000666600000000000033330000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000000000000000EEEE000000000000DDDD000000000000BBBB000000000000AAAA0000000000008888000000000000777700000000000055550000000000004444000000000000222200000000000011110000EEEEEEEEEEEE0000DDDDDDDDDDDD0000BBBBBBBBBBBB0000AAAAAAAAAAAA000088888888888800007777777777770000555555555555000044444444444400002222222222220000111111111111000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002B56562B00000000000000000000000000000000000000000000000000002B5656560056562B000000000000000000000000000000000000000000002B565656002B2B000000562B000000000000000000000000000000000000000081560000002B2B00000056FF000000000000000000000000000000000000000081815600002B2B0056FFFFFF000000000000000000000000000000000000000081008181812B2BFFFFFF00FF0000000000000000000000000000000000000000810000008181FFFF000000FF00000000000000000000000000000000000000008100002B5681FF2B2B0000FF000000000000000000000000000000000000000081002B2B2B81FF2B2B2B00FF0000000000000000000000000000000000000000812B2B000081FF00002B2BFF0000000000000000000000000000000000000000818100000081FF000000FFFF00000000000000000000000000000000000000002B8181000081FF0000FFFF2B000000000000000000000000000000000000000000002B818181FFFFFF2B00000000000000000000000000000000000000000000000000002B81FF2B0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001E0000007F800001FFE00001FFE00001FFE00001FFE00001FFE00001FFE00001FFE00001FFE00001FFE00001FFE000007F8000001E0000000000000000000000000000000000000000000</_256_Color_Icon>
Expand Down Expand Up @@ -698,35 +698,7 @@
<Path>Source\JSON Data Classes\JSON Helper\New JSON.vi</Path>
<VI_Title/>
</Items_Data>
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
<NameSub_Menu_Name>Get Object Parameters.xnode</NameSub_Menu_Name>
<Short_Name/>
<is_Merge_VI>false</is_Merge_VI>
<Position>
<Row>2</Row>
<Column>2</Column>
</Position>
<Icon>00000000</Icon>
<Path>Source\JSON Data Classes\JSON Object\Get Parameter XNode\Get Object Parameters.xnode</Path>
<VI_Title/>
</Items_Data>
<Items_Data>
<Type>Item</Type>
<Sub_Palette_Index>-1</Sub_Palette_Index>
<NameSub_Menu_Name>Set Object Parameters.xnode</NameSub_Menu_Name>
<Short_Name/>
<is_Merge_VI>false</is_Merge_VI>
<Position>
<Row>2</Row>
<Column>3</Column>
</Position>
<Icon>00000000</Icon>
<Path>Source\JSON Data Classes\JSON Object\Set Object Parameters XNode\Set Object Parameters.xnode</Path>
<VI_Title/>
</Items_Data>
<GUID>59572372E8DD3FAF8D90BFB25B7C008F</GUID>
<GUID>5684D8011CBDCBA4823083C6FC6B9929</GUID>
</Functions_Palette_Data>
</Library_Palette_Definition>
</VI_Package_Builder_Settings>
22 changes: 13 additions & 9 deletions Source/JSON Data Classes/JSON Array/JSON Array.lvclass
View file

Large diffs are not rendered by default.

Binary file modified Source/JSON Data Classes/JSON Array/To String.vi
View file
Binary file not shown.
20 changes: 12 additions & 8 deletions Source/JSON Data Classes/JSON Boolean/JSON Boolean.lvclass
View file

Large diffs are not rendered by default.

Binary file modified Source/JSON Data Classes/JSON Boolean/To String.vi
View file
Binary file not shown.
20 changes: 12 additions & 8 deletions Source/JSON Data Classes/JSON Datatype/JSON Null.lvclass
View file

Large diffs are not rendered by default.

Binary file modified Source/JSON Data Classes/JSON Datatype/To Pretty String.vi
View file
Binary file not shown.
Binary file modified Source/JSON Data Classes/JSON Datatype/To String.vi
View file
Binary file not shown.
Binary file modified Source/JSON Data Classes/JSON Helper/From String.vi
View file
Binary file not shown.
10 changes: 5 additions & 5 deletions Source/JSON Data Classes/JSON Helper/JSON Helper.lvclass
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
<Property Name="NI.ClassItem.IsStaticMethod" Type="Bool">true</Property>
<Property Name="NI.ClassItem.MethodScope" Type="UInt">1</Property>
<Property Name="NI.ClassItem.Priority" Type="Int">1</Property>
<Property Name="NI.ClassItem.State" Type="Int">1350574592</Property>
<Property Name="NI.ClassItem.State" Type="Int">1342710274</Property>
</Item>
<Item Name="NextToken.vi" Type="VI" URL="../Parsing/NextToken.vi">
<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">&amp;A#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!'G!!!!$!!-1#%'=X2B&gt;(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&amp;!!!Q!!!!%!!AFF=H*P=C"P&gt;81!FQ$R!!!!!!!!!!)-4&amp;:+5U^/,GRW&lt;'FC$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/!!^!!Q!*37ZE:8AA4X6U!#"!-0````]83F.04C"4&gt;(*J&lt;G=A5'&amp;T=X2I=G^V:WA!"!!!!#"!5!!$!!!!!1!#%W6S=G^S)'FO)#BO&lt;S"F=H*P=CE!$U!$!!B*&lt;G2F?#"*&lt;A!!&amp;%!Q`````QN+5U^/)&amp;.U=GFO:Q"5!0!!$!!$!!1!"1!'!!=!"Q!(!!=!#!!(!!E!#A)!!(A!!!U)!!!*!!!!#1!!!!U,!!!!!!!!!!!!!!!!!!!!!!!!#!!!!!!!!!!+!!!!#!!!!!!"!!M!!!!!</Property>
Expand All @@ -52,7 +52,7 @@
<Property Name="NI.ClassItem.IsStaticMethod" Type="Bool">true</Property>
<Property Name="NI.ClassItem.MethodScope" Type="UInt">1</Property>
<Property Name="NI.ClassItem.Priority" Type="Int">1</Property>
<Property Name="NI.ClassItem.State" Type="Int">1350574592</Property>
<Property Name="NI.ClassItem.State" Type="Int">1350574594</Property>
</Item>
<Item Name="Parse Array.vi" Type="VI" URL="../Parsing/Parse Array.vi">
<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">&amp;A#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!%J!!!!#Q!-1#%'=X2B&gt;(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&amp;!!!Q!!!!%!!AFF=H*P=C"P&gt;81!"!!!!!^!!Q!*37ZE:8AA4X6U!$J!=!!?!!!B$%R73F.04CZM&gt;GRJ9B*+5U^/)%&amp;S=G&amp;Z,GRW9WRB=X-!$EJ44UYA18*S98EA&lt;X6U!!!A1&amp;!!!Q!!!!%!!B.F=H*P=C"J&lt;C!I&lt;G]A:8*S&lt;X)J!!^!!Q!)37ZE:8AA37Y!!"2!-0````],3F.04C"4&gt;(*J&lt;G=!6!$Q!!Q!!Q!%!!5!"A!%!!1!"!!%!!=!"!!)!!E$!!"Y!!!.#!!!!!!!!!U+!!!*!!!!!!!!!!!!!!!!!!!!!!!!!!I!!!!!!!!!#A!!!!A!!!!!!1!+!!!!!!</Property>
Expand All @@ -61,7 +61,7 @@
<Property Name="NI.ClassItem.IsStaticMethod" Type="Bool">true</Property>
<Property Name="NI.ClassItem.MethodScope" Type="UInt">1</Property>
<Property Name="NI.ClassItem.Priority" Type="Int">1</Property>
<Property Name="NI.ClassItem.State" Type="Int">1117782544</Property>
<Property Name="NI.ClassItem.State" Type="Int">1115685394</Property>
</Item>
<Item Name="Parse Numeric.vi" Type="VI" URL="../Parsing/Parse Numeric.vi">
<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">&amp;A#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!%N!!!!#Q!-1#%'=X2B&gt;(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&amp;!!!Q!!!!%!!AFF=H*P=C"P&gt;81!"!!!!!^!!Q!*37ZE:8AA4X6U!$Z!=!!?!!!D$%R73F.04CZM&gt;GRJ9B2+5U^/)%ZV&lt;76S;7-O&lt;(:D&lt;'&amp;T=Q!13F.04C"/&gt;7VF=GFD)'^V&gt;!!!)%"1!!-!!!!"!!)4:8*S&lt;X)A;7YA+'ZP)'6S=G^S+1!01!-!#%FO:'6Y)%FO!!!51$$`````#UJ44UYA5X2S;7ZH!&amp;1!]!!-!!-!"!!&amp;!!9!"!!%!!1!"!!(!!1!#!!*!Q!!?!!!$1A!!!!!!!!.#A!!#1!!!!!!!!!!!!!!!!!!!!!!!!!+!!!!!!!!!!I!!!!)!!!!!!%!#A!!!!!</Property>
Expand All @@ -79,7 +79,7 @@
<Property Name="NI.ClassItem.IsStaticMethod" Type="Bool">true</Property>
<Property Name="NI.ClassItem.MethodScope" Type="UInt">1</Property>
<Property Name="NI.ClassItem.Priority" Type="Int">1</Property>
<Property Name="NI.ClassItem.State" Type="Int">1117782544</Property>
<Property Name="NI.ClassItem.State" Type="Int">1115685394</Property>
</Item>
<Item Name="Parse String.vi" Type="VI" URL="../Parsing/Parse String.vi">
<Property Name="NI.ClassItem.ConnectorPane" Type="Bin">&amp;A#!!!!!!!)!"1!&amp;!!!-!%!!!@````]!!!!"!!%!!!%^!!!!$!!-1#%'=X2B&gt;(6T!!!,1!-!"'.P:'5!!""!-0````]'=W^V=G.F!!!71&amp;!!!Q!!!!%!!AFF=H*P=C"P&gt;81!&amp;E!Q`````QV198*T:71A5X2S;7ZH!!^!!Q!*37ZE:8AA4X6U!$B!=!!?!!!C$%R73F.04CZM&gt;GRJ9B.+5U^/)&amp;.U=GFO:SZM&gt;G.M98.T!!!,3F.04C"4&gt;(*J&lt;G=!"!!!!#"!5!!$!!!!!1!#%W6S=G^S)'FO)#BO&lt;S"F=H*P=CE!$U!$!!B*&lt;G2F?#"*&lt;A!!&amp;%!Q`````QN+5U^/)&amp;.U=GFO:Q"5!0!!$!!$!!1!"1!'!!=!"Q!(!!=!#!!(!!E!#A-!!(A!!!U)!!!*!!!!$1I!!!E!!!!!!!!!!!!!!!!!!!!!!!!!#A!!!!!!!!!+!!!!#!!!!!!"!!M!!!!!</Property>
Expand All @@ -97,7 +97,7 @@
<Property Name="NI.ClassItem.IsStaticMethod" Type="Bool">true</Property>
<Property Name="NI.ClassItem.MethodScope" Type="UInt">1</Property>
<Property Name="NI.ClassItem.Priority" Type="Int">1</Property>
<Property Name="NI.ClassItem.State" Type="Int">1117782544</Property>
<Property Name="NI.ClassItem.State" Type="Int">1644691986</Property>
</Item>
</Item>
<Item Name="To More Specific Type" Type="Folder">
Expand Down
Binary file modified Source/JSON Data Classes/JSON Helper/Parsing/LookAhead.vi
View file
Binary file not shown.
Binary file modified Source/JSON Data Classes/JSON Helper/Parsing/NextToken.vi
View file
Binary file not shown.
Binary file modified Source/JSON Data Classes/JSON Helper/Parsing/Parse Array.vi
View file
Binary file not shown.
Binary file modified Source/JSON Data Classes/JSON Helper/Parsing/Parse Numeric.vi
View file
Binary file not shown.
Binary file modified Source/JSON Data Classes/JSON Helper/Parsing/Parse Object.vi
View file
Binary file not shown.
Binary file modified Source/JSON Data Classes/JSON Helper/Parsing/Parse Value.vi
View file
Binary file not shown.
Binary file modified Source/JSON Data Classes/JSON Helper/Parsing/Token Type.ctl
View file
Binary file not shown.
Binary file modified Source/JSON Data Classes/JSON Helper/To File (Path).vi
View file
Binary file not shown.
Binary file modified Source/JSON Data Classes/JSON Helper/To File (Ref).vi
View file
Binary file not shown.
Loading

0 comments on commit a1b5149

Please sign in to comment.