]> 4ch.mooo.com Git - 16.git/commitdiff
cleaned
authorsparky4 <sparky4@cock.li>
Thu, 1 Oct 2015 18:56:58 +0000 (13:56 -0500)
committersparky4 <sparky4@cock.li>
Thu, 1 Oct 2015 18:56:58 +0000 (13:56 -0500)
67 files changed:
16.exe
16.map
16/00jsmn00.7z [new file with mode: 0755]
README.md
TODO.md [new file with mode: 0755]
bakapi.map
doc/TODO [deleted file]
doc/cguide3.zip [moved from src/lib/cguide3.zip with 100% similarity]
exmmtest.map
fmemtest.map
fontgfx.map
maptest.map
palettec.map
pcxtest.map
pcxtest2.map
scroll.exe
scroll.map
src/lib/00jsmn00/.hg/00changelog.i [deleted file]
src/lib/00jsmn00/.hg/branch [deleted file]
src/lib/00jsmn00/.hg/cache/branch2-served [deleted file]
src/lib/00jsmn00/.hg/dirstate [deleted file]
src/lib/00jsmn00/.hg/hgrc [deleted file]
src/lib/00jsmn00/.hg/requires [deleted file]
src/lib/00jsmn00/.hg/store/00changelog.i [deleted file]
src/lib/00jsmn00/.hg/store/00manifest.i [deleted file]
src/lib/00jsmn00/.hg/store/data/_l_i_c_e_n_s_e.i [deleted file]
src/lib/00jsmn00/.hg/store/data/_makefile.i [deleted file]
src/lib/00jsmn00/.hg/store/data/_r_e_a_d_m_e.i [deleted file]
src/lib/00jsmn00/.hg/store/data/_r_e_a_d_m_e.md.i [deleted file]
src/lib/00jsmn00/.hg/store/data/demo.c.i [deleted file]
src/lib/00jsmn00/.hg/store/data/example/jsondump.c.i [deleted file]
src/lib/00jsmn00/.hg/store/data/example/simple.c.i [deleted file]
src/lib/00jsmn00/.hg/store/data/jsmn.c.i [deleted file]
src/lib/00jsmn00/.hg/store/data/jsmn.h.i [deleted file]
src/lib/00jsmn00/.hg/store/data/jsmn__test.c.i [deleted file]
src/lib/00jsmn00/.hg/store/data/test.sh.i [deleted file]
src/lib/00jsmn00/.hg/store/fncache [deleted file]
src/lib/00jsmn00/.hg/store/phaseroots [deleted file]
src/lib/00jsmn00/.hg/store/undo [deleted file]
src/lib/00jsmn00/.hg/store/undo.phaseroots [deleted file]
src/lib/00jsmn00/.hg/undo.bookmarks [deleted file]
src/lib/00jsmn00/.hg/undo.branch [deleted file]
src/lib/00jsmn00/.hg/undo.desc [deleted file]
src/lib/00jsmn00/.hg/undo.dirstate [deleted file]
src/lib/00jsmn00/LICENSE [deleted file]
src/lib/00jsmn00/Makefile [deleted file]
src/lib/00jsmn00/README.md [deleted file]
src/lib/00jsmn00/example/JSONDUMP.EXE [deleted file]
src/lib/00jsmn00/example/MAPTEST.EXE [deleted file]
src/lib/00jsmn00/example/MAPTEST2.EXE [deleted file]
src/lib/00jsmn00/example/SIMPLE.EXE [deleted file]
src/lib/00jsmn00/example/jsondump [deleted file]
src/lib/00jsmn00/example/jsondump.c [deleted file]
src/lib/00jsmn00/example/maptest [deleted file]
src/lib/00jsmn00/example/maptest.c [deleted file]
src/lib/00jsmn00/example/maptest2 [deleted file]
src/lib/00jsmn00/example/maptest2.c [deleted file]
src/lib/00jsmn00/example/simple.c [deleted file]
src/lib/00jsmn00/farjsmn.c [deleted file]
src/lib/00jsmn00/farjsmn.h [deleted file]
src/lib/00jsmn00/jsmn.c [deleted file]
src/lib/00jsmn00/jsmn.h [deleted file]
src/lib/00jsmn00/jsmn_test [deleted file]
src/lib/00jsmn00/jsmn_test.c [deleted file]
test.map
test2.map
vgmtest.map

diff --git a/16.exe b/16.exe
index 338b53aa74be5881b2af5a32e1ded98200606b8b..8723f6ed47061c186f8367b116c646a1efd65d7a 100755 (executable)
Binary files a/16.exe and b/16.exe differ
diff --git a/16.map b/16.map
index e2ba6e06bb6c0bcd40bfd93d7d63ec5f979ffff6..4a263d1c9cf2e892a769ac7a717192a8bd449736 100755 (executable)
--- a/16.map
+++ b/16.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (32-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/01 13:49:51
+Created on:       15/10/01 13:56:58
 Executable Image: 16.exe
 creating a DOS executable
 
diff --git a/16/00jsmn00.7z b/16/00jsmn00.7z
new file mode 100755 (executable)
index 0000000..63917d3
Binary files /dev/null and b/16/00jsmn00.7z differ
index b2a727b735e1cb5c2b5c943da2892b2b162eff90..d0f38be2eab63e5aa39cb860c068c7c3266197b8 100755 (executable)
--- a/README.md
+++ b/README.md
@@ -11,44 +11,7 @@ Open watcom to compile the code of project 16
 16/modex16/ = pngwen's code archived~  \r
 src/ = source of project~  \r
 doc/ = documentation of the project~  \r
-doc/faq.txt = frequently asked questions file!  \r
-\r
-### TODO not in particular order~:\r
-\r
-+ DONE 1. SCROLLING!!!!!!!\r
-+ 2. Fix pngwen's pcx rendering code it dose not render large relolution pcx files well at all! almost done\r
-+ 3. tweak animation frame perloop and make the dpad controls a case switch (look at commander keen code?) and vsync horizontal animation\r
-+ DONE 4. movement and player movement when reaching edge of map\r
-+ DONE 5. sprite rendering\r
-+ 6. text box rendering\r
-+ semi done 7. text rendering\r
-+ DONE! YAY! 8. map loading\r
-+ DONE! YAY! wwww 9. map rendering~\r
-+ 10. map and item interation\r
-+ 11. item inventory~\r
-+ ==working on extending== DONE! but needs work! 12. Memory management (EMS + XMS) done but not tested...  \r
-+ 13. case switch with keyboard code (when your holding 2 arrow keys and a key is released the keyboard controller dose not read input from the port anymore for some weired reason)  \r
-+ 14. masking layer! (i think this is not easy to accomplish!)\r
-+ DONE 15. 8088 detection to turn off vsync!\r
-\r
-+ ==working== 16. (very important!) optoimize draw row and draw col\r
-\r
-+ not needed ... really... 17. merge map system and interperator from verge 2\r
-+ 18. save feature!\r
-+ 19. (also important) interperator! and possibly custom map system\r
-+ 20. (also important) lua scripting system!\r
-+ 21. extend the map system!\r
-+ DONE! 22. opl2/3 audio!!!!\r
-\r
-DONE! use IN_ReadControl!!  \r
-\r
-+ 23. engine core!\r
-+ ==working== 24. (MOST important!) FUCKING MASSIVE DATA MANAGEMENT!!! related to 12.\r
-SEMI DONE~ + 25. MUSIC PLAYBACK!!!! WWWW\r
-\r
-get dos_sj.rar  \r
-It may be very useful to us...  \r
-\r
+doc/faq.txt = frequently asked questions file!\r
 \r
 ### To compile:\r
 \r
diff --git a/TODO.md b/TODO.md
new file mode 100755 (executable)
index 0000000..d44cc43
--- /dev/null
+++ b/TODO.md
@@ -0,0 +1,43 @@
+### TODO not in particular order~:
+What needs to be done
++ DONE 1. SCROLLING!!!!!!!
++ 2. Fix pngwen's pcx rendering code it dose not render large relolution pcx files well at all! almost done
++ 3. tweak animation frame perloop and make the dpad controls a case switch (look at commander keen code?) and vsync horizontal animation
++ DONE 4. movement and player movement when reaching edge of map
++ DONE 5. sprite rendering
++ 6. text box rendering
++ semi done 7. text rendering
++ DONE! YAY! 8. map loading
++ DONE! YAY! wwww 9. map rendering~
++ 10. map and item interation
++ 11. item inventory~
++ ==working on extending== DONE! but needs work! 12. Memory management (EMS + XMS) done but not tested...  
++ 13. case switch with keyboard code (when your holding 2 arrow keys and a key is released the keyboard controller dose not read input from the port anymore for some weired reason)  
++ 14. masking layer! (i think this is not easy to accomplish!)
++ DONE 15. 8088 detection to turn off vsync!
+
++ ==working== 16. (very important!) optoimize draw row and draw col
+
++ not needed ... really... 17. merge map system and interperator from verge 2
++ 18. save feature!
++ 19. (also important) interperator! and possibly custom map system
++ 20. (also important) lua scripting system!
++ 21. extend the map system!
++ DONE! 22. opl2/3 audio!!!!
+
+DONE! use IN_ReadControl!!  
+
++ 23. engine core!
++ ==working== 24. (MOST important!) FUCKING MASSIVE DATA MANAGEMENT!!! related to 12.
+SEMI DONE~ + 25. MUSIC PLAYBACK!!!! WWWW
++ 26. basic SFX from opl2 + pc speaker!
++ 27. clean up repository after event 1.
+
++ 30. script system for text and interaction
++ 9000. fix any bugs found
++ 9001. make the game wwww
+
+
+
+get dos_sj.rar  
+It may be very useful to us...  
index 526847457e228e40529e03f1fe684e14292758f0..0123fe07a93964a6b6f1f6d80d111958ebbe502d 100755 (executable)
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (32-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/01 13:49:51
+Created on:       15/10/01 13:56:58
 Executable Image: bakapi.exe
 creating a DOS executable
 
diff --git a/doc/TODO b/doc/TODO
deleted file mode 100755 (executable)
index 1f2a677..0000000
--- a/doc/TODO
+++ /dev/null
@@ -1,19 +0,0 @@
-16/ is an experimental branch of project 16\r
-\r
-What needs to be done\r
-1. Map/event system and movement\r
-Look at the game Pokemon Crystal and Ib for an example of what I mean\r
-2. sprite loading and rendering! properly\r
-3. font and text box rendering and system\r
-4. map rendering\r
-5. map and item interaction\r
-6. fix any bugs found\r
-7. script system for text and interaction\r
-\r
-8. clean up repository after event 1.\r
-\r
-9. basic sounds from opl2 + pc speaker!\r
-10. make the game wwww\r
-\r
-\r
-\r
similarity index 100%
rename from src/lib/cguide3.zip
rename to doc/cguide3.zip
index c6276fea92ec55b8f82034d171fa72938815683c..961a90384e1713602c7acfb40b2e46af068e5e25 100755 (executable)
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (32-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/01 13:49:51
+Created on:       15/10/01 13:56:58
 Executable Image: exmmtest.exe
 creating a DOS executable
 
index 042c88295eb4e91b507c8fb8e4cfa78b3442888a..5bd65856234d159032dd6e63ce190a2cac893d42 100755 (executable)
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (32-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/01 13:49:51
+Created on:       15/10/01 13:56:58
 Executable Image: fmemtest.exe
 creating a DOS executable
 
index 1f10da822311efed6a66a73eb55b770485a2e208..d5c7bd0ef462128ba10ae7c1dc85fdf526230cb6 100755 (executable)
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (32-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/01 13:49:51
+Created on:       15/10/01 13:56:58
 Executable Image: fontgfx.exe
 creating a DOS executable
 
index 1c11826fd9a50c1e0476db8e3017a57bea98b058..b4935795f94fc437be477e8298eea94a3d84e843 100755 (executable)
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (32-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/01 13:49:51
+Created on:       15/10/01 13:56:58
 Executable Image: maptest.exe
 creating a DOS executable
 
index ec898cba6eb3026fd5e0d0c2861550a57647635a..4bd13f99ef030169c567a32569c581526a5f3716 100755 (executable)
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (32-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/01 13:49:51
+Created on:       15/10/01 13:56:58
 Executable Image: palettec.exe
 creating a DOS executable
 
index ad4f02e85c69d3ff14f78d4a3714b9348e7216b5..e43add29c3988877eef4e53a399f749081f7069c 100755 (executable)
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (32-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/01 13:49:51
+Created on:       15/10/01 13:56:58
 Executable Image: pcxtest.exe
 creating a DOS executable
 
index cebc4f474a63462d4aed398fc81fe6ed1c8e9313..c237ce42af9829ebad44481c70dd2711b286611a 100755 (executable)
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (32-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/01 13:49:51
+Created on:       15/10/01 13:56:58
 Executable Image: pcxtest2.exe
 creating a DOS executable
 
index cb2423343cba0e9d1b356577cfd1feb7e8d00c35..e0625aeb1dbde3a8babe770ad2a09d5259c56cbd 100755 (executable)
Binary files a/scroll.exe and b/scroll.exe differ
index 561a541378b62a0a9f2ed2201bf747d96fb88568..63bde43916422233e7aa346277ae5e0ab128cf56 100755 (executable)
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (32-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/01 13:49:51
+Created on:       15/10/01 13:56:58
 Executable Image: scroll.exe
 creating a DOS executable
 
diff --git a/src/lib/00jsmn00/.hg/00changelog.i b/src/lib/00jsmn00/.hg/00changelog.i
deleted file mode 100755 (executable)
index d3a8311..0000000
Binary files a/src/lib/00jsmn00/.hg/00changelog.i and /dev/null differ
diff --git a/src/lib/00jsmn00/.hg/branch b/src/lib/00jsmn00/.hg/branch
deleted file mode 100755 (executable)
index 4ad96d5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-default
diff --git a/src/lib/00jsmn00/.hg/cache/branch2-served b/src/lib/00jsmn00/.hg/cache/branch2-served
deleted file mode 100755 (executable)
index 7305281..0000000
+++ /dev/null
@@ -1,5 +0,0 @@
-6979f2e6ffa5a5723849a71dce7d22dd598c7832 87
-3db7fc681e7a4cbaaba03edb51bbf0c875c5ed21 c clean
-6979f2e6ffa5a5723849a71dce7d22dd598c7832 o default
-531a30361bd2fce5b2180f0e0028bb74faf71129 c markdown
-8d750a9d664e55ea40b400f338e119aac847c771 o setekhid/jsmnh2822-warning-commas-at-the-end-of-e-1408807731663
diff --git a/src/lib/00jsmn00/.hg/dirstate b/src/lib/00jsmn00/.hg/dirstate
deleted file mode 100755 (executable)
index c02405c..0000000
Binary files a/src/lib/00jsmn00/.hg/dirstate and /dev/null differ
diff --git a/src/lib/00jsmn00/.hg/hgrc b/src/lib/00jsmn00/.hg/hgrc
deleted file mode 100755 (executable)
index 3535e61..0000000
+++ /dev/null
@@ -1,2 +0,0 @@
-[paths]
-default = http://bitbucket.org/zserge/jsmn
diff --git a/src/lib/00jsmn00/.hg/requires b/src/lib/00jsmn00/.hg/requires
deleted file mode 100755 (executable)
index f634f66..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-dotencode
-fncache
-revlogv1
-store
diff --git a/src/lib/00jsmn00/.hg/store/00changelog.i b/src/lib/00jsmn00/.hg/store/00changelog.i
deleted file mode 100755 (executable)
index 2e012d4..0000000
Binary files a/src/lib/00jsmn00/.hg/store/00changelog.i and /dev/null differ
diff --git a/src/lib/00jsmn00/.hg/store/00manifest.i b/src/lib/00jsmn00/.hg/store/00manifest.i
deleted file mode 100755 (executable)
index dd7435e..0000000
Binary files a/src/lib/00jsmn00/.hg/store/00manifest.i and /dev/null differ
diff --git a/src/lib/00jsmn00/.hg/store/data/_l_i_c_e_n_s_e.i b/src/lib/00jsmn00/.hg/store/data/_l_i_c_e_n_s_e.i
deleted file mode 100755 (executable)
index fba581b..0000000
Binary files a/src/lib/00jsmn00/.hg/store/data/_l_i_c_e_n_s_e.i and /dev/null differ
diff --git a/src/lib/00jsmn00/.hg/store/data/_makefile.i b/src/lib/00jsmn00/.hg/store/data/_makefile.i
deleted file mode 100755 (executable)
index 1109b55..0000000
Binary files a/src/lib/00jsmn00/.hg/store/data/_makefile.i and /dev/null differ
diff --git a/src/lib/00jsmn00/.hg/store/data/_r_e_a_d_m_e.i b/src/lib/00jsmn00/.hg/store/data/_r_e_a_d_m_e.i
deleted file mode 100755 (executable)
index 0433f55..0000000
Binary files a/src/lib/00jsmn00/.hg/store/data/_r_e_a_d_m_e.i and /dev/null differ
diff --git a/src/lib/00jsmn00/.hg/store/data/_r_e_a_d_m_e.md.i b/src/lib/00jsmn00/.hg/store/data/_r_e_a_d_m_e.md.i
deleted file mode 100755 (executable)
index af43bd6..0000000
Binary files a/src/lib/00jsmn00/.hg/store/data/_r_e_a_d_m_e.md.i and /dev/null differ
diff --git a/src/lib/00jsmn00/.hg/store/data/demo.c.i b/src/lib/00jsmn00/.hg/store/data/demo.c.i
deleted file mode 100755 (executable)
index 0165bea..0000000
Binary files a/src/lib/00jsmn00/.hg/store/data/demo.c.i and /dev/null differ
diff --git a/src/lib/00jsmn00/.hg/store/data/example/jsondump.c.i b/src/lib/00jsmn00/.hg/store/data/example/jsondump.c.i
deleted file mode 100755 (executable)
index 9359140..0000000
Binary files a/src/lib/00jsmn00/.hg/store/data/example/jsondump.c.i and /dev/null differ
diff --git a/src/lib/00jsmn00/.hg/store/data/example/simple.c.i b/src/lib/00jsmn00/.hg/store/data/example/simple.c.i
deleted file mode 100755 (executable)
index e3c6137..0000000
Binary files a/src/lib/00jsmn00/.hg/store/data/example/simple.c.i and /dev/null differ
diff --git a/src/lib/00jsmn00/.hg/store/data/jsmn.c.i b/src/lib/00jsmn00/.hg/store/data/jsmn.c.i
deleted file mode 100755 (executable)
index d037ee4..0000000
Binary files a/src/lib/00jsmn00/.hg/store/data/jsmn.c.i and /dev/null differ
diff --git a/src/lib/00jsmn00/.hg/store/data/jsmn.h.i b/src/lib/00jsmn00/.hg/store/data/jsmn.h.i
deleted file mode 100755 (executable)
index 0361cd2..0000000
Binary files a/src/lib/00jsmn00/.hg/store/data/jsmn.h.i and /dev/null differ
diff --git a/src/lib/00jsmn00/.hg/store/data/jsmn__test.c.i b/src/lib/00jsmn00/.hg/store/data/jsmn__test.c.i
deleted file mode 100755 (executable)
index 4a16546..0000000
Binary files a/src/lib/00jsmn00/.hg/store/data/jsmn__test.c.i and /dev/null differ
diff --git a/src/lib/00jsmn00/.hg/store/data/test.sh.i b/src/lib/00jsmn00/.hg/store/data/test.sh.i
deleted file mode 100755 (executable)
index 7b9031c..0000000
Binary files a/src/lib/00jsmn00/.hg/store/data/test.sh.i and /dev/null differ
diff --git a/src/lib/00jsmn00/.hg/store/fncache b/src/lib/00jsmn00/.hg/store/fncache
deleted file mode 100755 (executable)
index 4b7c904..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-data/example/jsondump.c.i
-data/jsmn_test.c.i
-data/test.sh.i
-data/jsmn.h.i
-data/README.i
-data/example/simple.c.i
-data/demo.c.i
-data/jsmn.c.i
-data/LICENSE.i
-data/Makefile.i
-data/README.md.i
diff --git a/src/lib/00jsmn00/.hg/store/phaseroots b/src/lib/00jsmn00/.hg/store/phaseroots
deleted file mode 100755 (executable)
index e69de29..0000000
diff --git a/src/lib/00jsmn00/.hg/store/undo b/src/lib/00jsmn00/.hg/store/undo
deleted file mode 100755 (executable)
index 6d0d7f0..0000000
Binary files a/src/lib/00jsmn00/.hg/store/undo and /dev/null differ
diff --git a/src/lib/00jsmn00/.hg/store/undo.phaseroots b/src/lib/00jsmn00/.hg/store/undo.phaseroots
deleted file mode 100755 (executable)
index e69de29..0000000
diff --git a/src/lib/00jsmn00/.hg/undo.bookmarks b/src/lib/00jsmn00/.hg/undo.bookmarks
deleted file mode 100755 (executable)
index e69de29..0000000
diff --git a/src/lib/00jsmn00/.hg/undo.branch b/src/lib/00jsmn00/.hg/undo.branch
deleted file mode 100755 (executable)
index 331d858..0000000
+++ /dev/null
@@ -1 +0,0 @@
-default
\ No newline at end of file
diff --git a/src/lib/00jsmn00/.hg/undo.desc b/src/lib/00jsmn00/.hg/undo.desc
deleted file mode 100755 (executable)
index a4dbe65..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-0
-pull
-http://bitbucket.org/zserge/jsmn
diff --git a/src/lib/00jsmn00/.hg/undo.dirstate b/src/lib/00jsmn00/.hg/undo.dirstate
deleted file mode 100755 (executable)
index e69de29..0000000
diff --git a/src/lib/00jsmn00/LICENSE b/src/lib/00jsmn00/LICENSE
deleted file mode 100755 (executable)
index c84fb2e..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (c) 2010 Serge A. Zaitsev
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
diff --git a/src/lib/00jsmn00/Makefile b/src/lib/00jsmn00/Makefile
deleted file mode 100755 (executable)
index 5e3e2a9..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-# You can put your build options here
--include config.mk
-
-all: libjsmn.a 
-
-libjsmn.a: jsmn.o
-       $(AR) rc $@ $^
-
-%.o: %.c jsmn.h
-       $(CC) -c $(CFLAGS) $< -o $@
-
-test: jsmn_test
-       ./jsmn_test
-
-jsmn_test: jsmn_test.o
-       $(CC) $(LDFLAGS) -L. -ljsmn $< -o $@
-
-jsmn_test.o: jsmn_test.c libjsmn.a
-
-simple_example: example/simple.o libjsmn.a
-       $(CC) $(LDFLAGS) $^ -o $@
-
-jsondump: example/jsondump.o libjsmn.a
-       $(CC) $(LDFLAGS) $^ -o $@
-
-clean:
-       rm -f jsmn.o jsmn_test.o example/simple.o
-       rm -f jsmn_test
-       rm -f jsmn_test.exe
-       rm -f libjsmn.a
-       rm -f simple_example
-       rm -f jsondump
-
-.PHONY: all clean test
-
diff --git a/src/lib/00jsmn00/README.md b/src/lib/00jsmn00/README.md
deleted file mode 100755 (executable)
index 353af94..0000000
+++ /dev/null
@@ -1,167 +0,0 @@
-
-JSMN
-====
-
-jsmn (pronounced like 'jasmine') is a minimalistic JSON parser in C.  It can be
-easily integrated into resource-limited or embedded projects.
-
-You can find more information about JSON format at [json.org][1]
-
-Library sources are available at [bitbucket.org/zserge/jsmn][2]
-
-The web page with some information about jsmn can be found at
-[http://zserge.com/jsmn.html][3]
-
-Philosophy
-----------
-
-Most JSON parsers offer you a bunch of functions to load JSON data, parse it
-and extract any value by its name. jsmn proves that checking the correctness of
-every JSON packet or allocating temporary objects to store parsed JSON fields
-often is an overkill. 
-
-JSON format itself is extremely simple, so why should we complicate it?
-
-jsmn is designed to be **robust** (it should work fine even with erroneous
-data), **fast** (it should parse data on the fly), **portable** (no superfluous
-dependencies or non-standard C extensions). An of course, **simplicity** is a
-key feature - simple code style, simple algorithm, simple integration into
-other projects.
-
-Features
---------
-
-* compatible with C89
-* no dependencies (even libc!)
-* highly portable (tested on x86/amd64, ARM, AVR)
-* about 200 lines of code
-* extremely small code footprint
-* API contains only 2 functions
-* no dynamic memory allocation
-* incremental single-pass parsing
-* library code is covered with unit-tests
-
-Design
-------
-
-The rudimentary jsmn object is a **token**. Let's consider a JSON string:
-
-       '{ "name" : "Jack", "age" : 27 }'
-
-It holds the following tokens:
-
-* Object: `{ "name" : "Jack", "age" : 27}` (the whole object)
-* Strings: `"name"`, `"Jack"`, `"age"` (keys and some values)
-* Number: `27`
-
-In jsmn, tokens do not hold any data, but point to token boundaries in JSON
-string instead. In the example above jsmn will create tokens like: Object
-[0..31], String [3..7], String [12..16], String [20..23], Number [27..29].
-
-Every jsmn token has a type, which indicates the type of corresponding JSON
-token. jsmn supports the following token types:
-
-* Object - a container of key-value pairs, e.g.:
-       `{ "foo":"bar", "x":0.3 }`
-* Array - a sequence of values, e.g.:
-       `[ 1, 2, 3 ]`
-* String - a quoted sequence of chars, e.g.: `"foo"`
-* Primitive - a number, a boolean (`true`, `false`) or `null`
-
-Besides start/end positions, jsmn tokens for complex types (like arrays
-or objects) also contain a number of child items, so you can easily follow
-object hierarchy.
-
-This approach provides enough information for parsing any JSON data and makes
-it possible to use zero-copy techniques.
-
-Install
--------
-
-To clone the repository you should have mercurial installed. Just run:
-
-       $ hg clone http://bitbucket.org/zserge/jsmn jsmn
-
-Repository layout is simple: jsmn.c and jsmn.h are library files, tests are in
-the jsmn\_test.c, you will also find README, LICENSE and Makefile files inside.
-
-To build the library, run `make`. It is also recommended to run `make test`.
-Let me know, if some tests fail.
-
-If build was successful, you should get a `libjsmn.a` library.
-The header file you should include is called `"jsmn.h"`.
-
-API
----
-
-Token types are described by `jsmntype_t`:
-
-       typedef enum {
-               JSMN_PRIMITIVE = 0,
-               JSMN_OBJECT = 1,
-               JSMN_ARRAY = 2,
-               JSMN_STRING = 3
-       } jsmntype_t;
-
-**Note:** Unlike JSON data types, primitive tokens are not divided into
-numbers, booleans and null, because one can easily tell the type using the
-first character:
-
-* <code>'t', 'f'</code> - boolean 
-* <code>'n'</code> - null
-* <code>'-', '0'..'9'</code> - number
-
-Token is an object of `jsmntok_t` type:
-
-       typedef struct {
-               jsmntype_t type; // Token type
-               int start;       // Token start position
-               int end;         // Token end position
-               int size;        // Number of child (nested) tokens
-       } jsmntok_t;
-
-**Note:** string tokens point to the first character after
-the opening quote and the previous symbol before final quote. This was made 
-to simplify string extraction from JSON data.
-
-All job is done by `jsmn_parser` object. You can initialize a new parser using:
-
-       jsmn_parser parser;
-       jsmntok_t tokens[10];
-
-       jsmn_init(&parser);
-
-       // js - pointer to JSON string
-       // tokens - an array of tokens available
-       // 10 - number of tokens available
-       jsmn_parse(&parser, js, tokens, 10);
-
-This will create a parser, and then it tries to parse up to 10 JSON tokens from
-the `js` string.
-
-A non-negative reutrn value of `jsmn_parse` is the number of tokens actually
-used by the parser.
-Passing NULL instead of the tokens array would not store parsing results, but
-instead the function will return the value of tokens needed to parse the given
-string. This can be useful if you don't know yet how many tokens to allocate.
-
-If something goes wrong, you will get an error. Error will be one of these:
-
-* `JSMN_ERROR_INVAL` - bad token, JSON string is corrupted
-* `JSMN_ERROR_NOMEM` - not enough tokens, JSON string is too large
-* `JSMN_ERROR_PART` - JSON string is too short, expecting more JSON data
-
-If you get `JSON_ERROR_NOMEM`, you can re-allocate more tokens and call
-`jsmn_parse` once more.  If you read json data from the stream, you can
-periodically call `jsmn_parse` and check if return value is `JSON_ERROR_PART`.
-You will get this error until you reach the end of JSON data.
-
-Other info
-----------
-
-This software is distributed under [MIT license](http://www.opensource.org/licenses/mit-license.php),
- so feel free to integrate it in your commercial products.
-
-[1]: http://www.json.org/
-[2]: https://bitbucket.org/zserge/jsmn/wiki/Home
-[3]: http://zserge.com/jsmn.html
diff --git a/src/lib/00jsmn00/example/JSONDUMP.EXE b/src/lib/00jsmn00/example/JSONDUMP.EXE
deleted file mode 100755 (executable)
index dccede1..0000000
Binary files a/src/lib/00jsmn00/example/JSONDUMP.EXE and /dev/null differ
diff --git a/src/lib/00jsmn00/example/MAPTEST.EXE b/src/lib/00jsmn00/example/MAPTEST.EXE
deleted file mode 100755 (executable)
index f3a7167..0000000
Binary files a/src/lib/00jsmn00/example/MAPTEST.EXE and /dev/null differ
diff --git a/src/lib/00jsmn00/example/MAPTEST2.EXE b/src/lib/00jsmn00/example/MAPTEST2.EXE
deleted file mode 100755 (executable)
index df04546..0000000
Binary files a/src/lib/00jsmn00/example/MAPTEST2.EXE and /dev/null differ
diff --git a/src/lib/00jsmn00/example/SIMPLE.EXE b/src/lib/00jsmn00/example/SIMPLE.EXE
deleted file mode 100755 (executable)
index 77ee0f4..0000000
Binary files a/src/lib/00jsmn00/example/SIMPLE.EXE and /dev/null differ
diff --git a/src/lib/00jsmn00/example/jsondump b/src/lib/00jsmn00/example/jsondump
deleted file mode 100755 (executable)
index bf6541f..0000000
Binary files a/src/lib/00jsmn00/example/jsondump and /dev/null differ
diff --git a/src/lib/00jsmn00/example/jsondump.c b/src/lib/00jsmn00/example/jsondump.c
deleted file mode 100755 (executable)
index b7d25cb..0000000
+++ /dev/null
@@ -1,124 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include "../jsmn.c"
-
-/*
- * An example of reading JSON from stdin and printing its content to stdout.
- * The output looks like YAML, but I'm not sure if it's really compatible.
- */
-static int jsoneq(const char *json, jsmntok_t *tok, const char *s) {
-       if (tok->type == JSMN_STRING && (int) strlen(s) == tok->end - tok->start &&
-                       strncmp(json + tok->start, s, tok->end - tok->start) == 0) {
-               return 0;
-       }
-       return -1;
-}
-
-static int dump(const char *js, jsmntok_t *t, size_t count, int indent) {
-       int i, j, k;
-       if (count == 0) {
-               return 0;
-       }
-       if (t->type == JSMN_PRIMITIVE) {
-               printf("%.*s", t->end - t->start, js+t->start);
-               return 1;
-       } else if (t->type == JSMN_STRING) {
-                               if(jsoneq(js, t, "data") == 0 )
-               {
-//                     printf("[[[[%d|%d]]]]\n", &(t+1)->size, (t+1)->size);
-                       printf("\n%.*s[xx[%d|%d]xx]\n", (t+1)->end - (t+1)->start, js+(t+1)->start, &(t+1)->size, (t+1)->size);
-               }
-               printf("'%.*s'", t->end - t->start, js+t->start);
-               return 1;
-       } else if (t->type == JSMN_OBJECT) {
-               printf("\n");
-               j = 0;
-               for (i = 0; i < t->size; i++) {
-                       for (k = 0; k < indent; k++) printf("  ");
-                       j += dump(js, t+1+j, count-j, indent+1);
-                       printf(": ");
-                       j += dump(js, t+1+j, count-j, indent+1);
-                       printf("\n");
-               }
-               return j+1;
-       } else if (t->type == JSMN_ARRAY) {
-               j = 0;
-               printf("\n");
-               for (i = 0; i < t->size; i++) {
-                       for (k = 0; k < indent-1; k++) printf("  ");
-                       printf("   - ");
-                       j += dump(js, t+1+j, count-j, indent+1);
-                       printf("\n");
-               }
-               return j+1;
-       }
-       return 0;
-}
-
-int main() {
-       int r;
-       int eof_expected = 0;
-       char *js = NULL;
-       size_t jslen = 0;
-       char buf[BUFSIZ];
-
-       jsmn_parser p;
-       jsmntok_t *tok;
-       size_t tokcount = 2;
-
-       /* Prepare parser */
-       jsmn_init(&p);
-
-       /* Allocate some tokens as a start */
-       tok = malloc(sizeof(*tok) * tokcount);
-       if (tok == NULL) {
-               fprintf(stderr, "malloc(): errno=%d\n", errno);
-               return 3;
-       }
-
-       for (;;) {
-               /* Read another chunk */
-               r = fread(buf, 1, sizeof(buf), stdin);
-               if (r < 0) {
-                       fprintf(stderr, "fread(): %d, errno=%d\n", r, errno);
-                       return 1;
-               }
-               if (r == 0) {
-                       if (eof_expected != 0) {
-                               return 0;
-                       } else {
-                               fprintf(stderr, "fread(): unexpected EOF\n");
-                               return 2;
-                       }
-               }
-
-               js = realloc(js, jslen + r + 1);
-               if (js == NULL) {
-                       fprintf(stderr, "realloc(): errno=%d\n", errno);
-                       return 3;
-               }
-               strncpy(js + jslen, buf, r);
-               jslen = jslen + r;
-
-again:
-               r = jsmn_parse(&p, js, jslen, tok, tokcount);
-               if (r < 0) {
-                       if (r == JSMN_ERROR_NOMEM) {
-                               tokcount = tokcount * 2;
-                               tok = realloc(tok, sizeof(*tok) * tokcount);
-                               if (tok == NULL) {
-                                       fprintf(stderr, "realloc(): errno=%d\n", errno);
-                                       return 3;
-                               }
-                               goto again;
-                       }
-               } else {
-                       dump(js, tok, p.toknext, 0);
-                       eof_expected = 1;
-               }
-       }
-
-       return 0;
-}
diff --git a/src/lib/00jsmn00/example/maptest b/src/lib/00jsmn00/example/maptest
deleted file mode 100755 (executable)
index a72fa7f..0000000
Binary files a/src/lib/00jsmn00/example/maptest and /dev/null differ
diff --git a/src/lib/00jsmn00/example/maptest.c b/src/lib/00jsmn00/example/maptest.c
deleted file mode 100755 (executable)
index 7cceabb..0000000
+++ /dev/null
@@ -1,122 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-//#include <errno.h>
-#include "../jsmn.c"
-
-//#define BUFSIZ 2048
-
-/*
- * A small example of jsmn parsing when JSON structure is known and number of
- * tokens is predictable.
- */
-
-/*char *json_string =
-       "{\"user\": \"johndoe\", \"admin\": false, \"uid\": 1000,\n  "
-       "\"groups\": [\"users\", \"wheel\", \"audio\", \"video\"]}";*/
-
-long int filesize(FILE *fp)\r
-{\r
-       long int save_pos, size_of_file;\r
-\r
-       save_pos = ftell(fp);\r
-       fseek(fp, 0L, SEEK_END);\r
-       size_of_file = ftell(fp);\r
-       fseek(fp, save_pos, SEEK_SET);\r
-       return(size_of_file);\r
-}
-
-static int jsoneq(const char *json, jsmntok_t *tok, const char *s) {
-       if (tok->type == JSMN_STRING && (int) strlen(s) == tok->end - tok->start &&
-                       strncmp(json + tok->start, s, tok->end - tok->start) == 0) {
-               return 0;
-       }
-       return -1;
-}
-
-int main() {
-       int i;
-       int r;
-       size_t z;
-       jsmn_parser p;
-       jsmntok_t t[(BUFSIZ/sizeof(jsmntok_t))*2]; /* We expect no more than 128 tokens */
-       FILE *fh = fopen("../../../../data/test.map", "r");
-       char *json_string = malloc(filesize(fh));
-
-       if(fh != NULL)
-       {
-       /*t = malloc(2048);
-       if (t == NULL) {
-               fprintf(stderr, "malloc(): errno=%d\n", errno);
-               return 3;
-       }*/
-               //printf("\n%d\n\n", sizeof(*t));
-               printf("\n%d", sizeof(*t));
-               printf("\n%d", sizeof(t));
-               printf("\n%d\n\n", sizeof(t)/sizeof(t[0]));
-               z = fread(json_string, 1, filesize(fh), fh);
-               //char json_s[2048];
-               fclose(fh); fh = NULL;
-               printf("[%d]\n", z);
-               json_string[z] = '\0';
-               // we can now close the file
-               //printf("]%s[\n", json_s);
-               //json_string=json_s;
-               //printf("[[%s]]\n", json_string);
-
-       jsmn_init(&p);
-       r = jsmn_parse(&p, json_string, strlen(json_string), t, sizeof(t)/sizeof(t[0]));
-       //t[(BUFSIZ/sizeof(jsmntok_t))*2+1].type=JSMN_OBJECT;
-       printf("[\n%s\n]", json_string);
-       printf("[[%d]]\n",r);
-       if (r < 0) {
-               printf("Failed to parse JSON: %d\n", r);
-               return 1;
-       }
-
-       /* Assume the top-level element is an object */
-       if (r < 1 || t[0].type != JSMN_OBJECT) {
-               printf("Object expected\n");
-               return 1;
-       }
-
-       /* Loop over all keys of the root object */
-       for (i = 1; i < r; i++) {
-               if (jsoneq(json_string, &t[i], "image") == 0) {
-                       /* We may use strndup() to fetch string value */
-                       printf("- image: %.*s\n", t[i+1].end-t[i+1].start,
-                                       json_string + t[i+1].start);
-                       i++;
-               } else if (jsoneq(json_string, &t[i], "admin") == 0) {
-                       /* We may additionally check if the value is either "true" or "false" */
-                       printf("- Admin: %.*s\n", t[i+1].end-t[i+1].start,
-                                       json_string + t[i+1].start);
-                       i++;
-               } else if (jsoneq(json_string, &t[i], "uid") == 0) {
-                       /* We may want to do strtol() here to get numeric value */
-                       printf("- UID: %.*s\n", t[i+1].end-t[i+1].start,
-                                       json_string + t[i+1].start);
-                       i++;
-               } else if (jsoneq(json_string, &t[i], "tilesets") == 0) {
-                       int j;
-                       printf("- tilesets:\n");
-                       if (t[i+1].type != JSMN_ARRAY) {
-                               continue; /* We expect groups to be an array of strings */
-                       }
-                       for (j = 0; j < t[i+1].size; j++) {
-                               jsmntok_t *g = &t[i+j+2];
-                               printf("  * %.*s\n", g->end - g->start, json_string + g->start);
-                       }
-                       i += t[i+1].size + 1;
-               } else {
-                       /*printf("Unexpected key: %.*s\n", t[i].end-t[i].start,
-                                       json_string + t[i].start);*/
-               }
-       }
-
-       //free(json_string);
-       }
-       if (fh != NULL) fclose(fh);
-  ////}
-       return 0;
-}
diff --git a/src/lib/00jsmn00/example/maptest2 b/src/lib/00jsmn00/example/maptest2
deleted file mode 100755 (executable)
index abc5640..0000000
Binary files a/src/lib/00jsmn00/example/maptest2 and /dev/null differ
diff --git a/src/lib/00jsmn00/example/maptest2.c b/src/lib/00jsmn00/example/maptest2.c
deleted file mode 100755 (executable)
index 017fbf8..0000000
+++ /dev/null
@@ -1,170 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <errno.h>
-#include "../jsmn.c"
-#include "../../../lib/types.h"
-
-/*
- * An example of reading JSON from stdin and printing its content to stdout.
- * The output looks like YAML, but I'm not sure if it's really compatible.
- */\r
-
-char *js_sv;
-
-typedef struct {\r
-       //bitmap_t *data;
-       byte *data;\r
-       word tileHeight;\r
-       word tileWidth;\r
-       unsigned int rows;\r
-       unsigned int cols;\r
-} tiles_t;\r
-\r
-typedef struct {\r
-       byte    *data;\r
-       tiles_t *tiles;\r
-       int width;\r
-       int height;\r
-} map_t;
-
-static int jsoneq(const char *json, jsmntok_t *tok, const char *s) {
-       if (tok->type == JSMN_STRING && (int) strlen(s) == tok->end - tok->start &&
-                       strncmp(json + tok->start, s, tok->end - tok->start) == 0) {
-               return 0;
-       }
-       return -1;
-}
-
-static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *js_sv,*/ map_t *map) {
-       int i, j, k;
-       if (count == 0) {
-               return 0;
-       }
-       /* We may want to do strtol() here to get numeric value */
-       if (t->type == JSMN_PRIMITIVE) {
-               if(js_sv == "height")
-               {
-                       map->height = (int)strtol(js+t->start, (char **)js+t->end, 10);
-                       printf("h:[%d]\n", map->height);
-               }else if(js_sv == "width")
-               {
-                       map->width = (int)strtol(js+t->start, (char **)js+t->end, 10);
-                       printf("w:[%d]\n", map->width);
-               }
-               return 1;
-               /* We may use strndup() to fetch string value */
-       } else if (t->type == JSMN_STRING) {
-               //printf("'%.*s'", t->end - t->start, js+t->start);
-               if (jsoneq(js, t, "height") == 0 && indent==1)
-               {
-                       js_sv="height";//strdup(js+t->start);//, t->end - t->start);
-                       printf("%s\n", js_sv);
-               }else if (jsoneq(js, t, "width") == 0 && indent==1)
-               {
-                       js_sv="width";//strdup(js+t->start);//, t->end - t->start);
-                       printf("%s\n", js_sv);
-               }else js_sv=NULL;
-               return 1;
-       } else if (t->type == JSMN_OBJECT) {
-               //printf("\n");
-               j = 0;
-               for (i = 0; i < t->size; i++) {
-                       //for (k = 0; k < indent; k++) printf("\t");
-                       j += dump(js, t+1+j, count-j, indent+1, map);
-                       //printf(": ");
-                       j += dump(js, t+1+j, count-j, indent+1, map);
-                       //printf("\n");
-               }
-               return j+1;
-       } else if (t->type == JSMN_ARRAY) {
-               j = 0;
-               //printf("==\n");
-               for (i = 0; i < t->size; i++) {
-                       //for (k = 0; k < indent-1; k++) printf("\t");
-                       //printf("\t-");
-                       j += dump(js, t+1+j, count-j, indent+1, map);
-                       //printf("==\n");
-               }
-               return j+1;
-       }
-       return 0;
-}
-
-int loadmap(char *mn, map_t *map)
-{
-       int r;
-       int eof_expected = 0;
-       char *js = NULL;
-       size_t jslen = 0;
-       char buf[BUFSIZ];
-
-       jsmn_parser p;
-       jsmntok_t *tok;
-       size_t tokcount = 2;
-
-       FILE *fh = fopen(mn, "r");
-
-       /* Prepare parser */
-       jsmn_init(&p);
-
-       /* Allocate some tokens as a start */
-       tok = malloc(sizeof(*tok) * tokcount);
-       if (tok == NULL) {
-               fprintf(stderr, "malloc(): errno=%d\n", errno);
-               return 3;
-       }
-
-       for (;;) {
-               /* Read another chunk */
-               r = fread(buf, 1, sizeof(buf), fh);
-               if (r < 0) {
-                       fprintf(stderr, "fread(): %d, errno=%d\n", r, errno);
-                       return 1;
-               }
-               if (r == 0) {
-                       if (eof_expected != 0) {
-                               return 0;
-                       } else {
-                               fprintf(stderr, "fread(): unexpected EOF\n");
-                               return 2;
-                       }
-               }
-
-               js = realloc(js, jslen + r + 1);
-               if (js == NULL) {
-                       fprintf(stderr, "realloc(): errno=%d\n", errno);
-                       return 3;
-               }
-               strncpy(js + jslen, buf, r);
-               jslen = jslen + r;
-
-again:
-               r = jsmn_parse(&p, js, jslen, tok, tokcount);
-               if (r < 0) {
-                       if (r == JSMN_ERROR_NOMEM) {
-                               tokcount = tokcount * 2;
-                               tok = realloc(tok, sizeof(*tok) * tokcount);
-                               if (tok == NULL) {
-                                       fprintf(stderr, "realloc(): errno=%d\n", errno);
-                                       return 3;
-                               }
-                               goto again;
-                       }
-               } else {
-                       dump(js, tok, p.toknext, 0, map);
-                       //fprintf(stdout, "[[[[%d]]]]\n", sizeof(tok));
-                       //printf("[\n%d\n]", jslen);
-                       eof_expected = 1;
-               }
-       }
-
-       return 0;
-}
-
-int main()
-{
-       map_t map;
-       loadmap("../../../../data/test.map", &map);
-       return 0;
-}
diff --git a/src/lib/00jsmn00/example/simple.c b/src/lib/00jsmn00/example/simple.c
deleted file mode 100755 (executable)
index ca2902b..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-#include <stdio.h>
-#include <string.h>
-#include "../jsmn.c"
-
-/*
- * A small example of jsmn parsing when JSON structure is known and number of
- * tokens is predictable.
- */
-
-const char *JSON_STRING =
-       "{\"user\": \"johndoe\", \"admin\": false, \"uid\": 1000,\n  "
-       "\"groups\": [\"users\", \"wheel\", \"audio\", \"video\"]}";
-
-static int jsoneq(const char *json, jsmntok_t *tok, const char *s) {
-       if (tok->type == JSMN_STRING && (int) strlen(s) == tok->end - tok->start &&
-                       strncmp(json + tok->start, s, tok->end - tok->start) == 0) {
-               return 0;
-       }
-       return -1;
-}
-
-int main() {
-       int i;
-       int r;
-       jsmn_parser p;
-       jsmntok_t t[128]; /* We expect no more than 128 tokens */
-
-       jsmn_init(&p);
-       r = jsmn_parse(&p, JSON_STRING, strlen(JSON_STRING), t, sizeof(t)/sizeof(t[0]));
-       if (r < 0) {
-               printf("Failed to parse JSON: %d\n", r);
-               return 1;
-       }
-
-       /* Assume the top-level element is an object */
-       if (r < 1 || t[0].type != JSMN_OBJECT) {
-               printf("Object expected\n");
-               return 1;
-       }
-
-       /* Loop over all keys of the root object */
-       for (i = 1; i < r; i++) {
-               if (jsoneq(JSON_STRING, &t[i], "user") == 0) {
-                       /* We may use strndup() to fetch string value */
-                       printf("- User: %.*s\n", t[i+1].end-t[i+1].start,
-                                       JSON_STRING + t[i+1].start);
-                       i++;
-               } else if (jsoneq(JSON_STRING, &t[i], "admin") == 0) {
-                       /* We may additionally check if the value is either "true" or "false" */
-                       printf("- Admin: %.*s\n", t[i+1].end-t[i+1].start,
-                                       JSON_STRING + t[i+1].start);
-                       i++;
-               } else if (jsoneq(JSON_STRING, &t[i], "uid") == 0) {
-                       /* We may want to do strtol() here to get numeric value */
-                       printf("- UID: %.*s\n", t[i+1].end-t[i+1].start,
-                                       JSON_STRING + t[i+1].start);
-                       i++;
-               } else if (jsoneq(JSON_STRING, &t[i], "groups") == 0) {
-                       int j;
-                       printf("- Groups:\n");
-                       if (t[i+1].type != JSMN_ARRAY) {
-                               continue; /* We expect groups to be an array of strings */
-                       }
-                       for (j = 0; j < t[i+1].size; j++) {
-                               jsmntok_t *g = &t[i+j+2];
-                               printf("  * %.*s\n", g->end - g->start, JSON_STRING + g->start);
-                       }
-                       i += t[i+1].size + 1;
-               } else {
-                       printf("Unexpected key: %.*s\n", t[i].end-t[i].start,
-                                       JSON_STRING + t[i].start);
-               }
-       }
-       return 0;
-}
diff --git a/src/lib/00jsmn00/farjsmn.c b/src/lib/00jsmn00/farjsmn.c
deleted file mode 100755 (executable)
index a2acc56..0000000
+++ /dev/null
@@ -1,317 +0,0 @@
-#include <stdlib.h>
-#include <stdio.h>     //fprintf for noisy debugging wwww
-
-#include "farjsmn.h"
-
-/**
- * Allocates a fresh unused token from the token pull.
- */
-static jsmntok_t huge *jsmn_alloc_token(jsmn_parser huge *parser,
-               jsmntok_t huge *tokens, size_t num_tokens) {
-       jsmntok_t huge *tok;
-       if (parser->toknext >= num_tokens) {
-               return NULL;
-       }
-       tok = &tokens[parser->toknext++];
-       tok->start = tok->end = -1;
-       tok->size = 0;
-#ifdef JSMN_PARENT_LINKS
-       tok->parent = -1;
-#endif
-       return tok;
-}
-
-/**
- * Fills token type and boundaries.
- */
-static void jsmn_fill_token(jsmntok_t huge *token, jsmntype_t type,
-                            int start, int end) {
-       token->type = type;
-       token->start = start;
-       token->end = end;
-       token->size = 0;
-}
-
-/**
- * Fills next available token with JSON primitive.
- */
-static jsmnerr_t jsmn_parse_primitive(jsmn_parser huge *parser, const char huge *js,
-               size_t len, jsmntok_t huge *tokens, size_t num_tokens) {
-       jsmntok_t huge *token;
-       int start;
-
-       start = parser->pos;
-
-       for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
-               switch (js[parser->pos]) {
-#ifndef JSMN_STRICT
-                       /* In strict mode primitive must be followed by "," or "}" or "]" */
-                       case ':':
-#endif
-                       case '\t' : case '\r' : case '\n' : case ' ' :
-                       case ','  : case ']'  : case '}' :
-                               goto found;
-               }
-               if (js[parser->pos] < 32 || js[parser->pos] >= 127) {
-                       parser->pos = start;
-                       return JSMN_ERROR_INVAL;
-               }
-       }
-#ifdef JSMN_STRICT
-       /* In strict mode primitive must be followed by a comma/object/array */
-       parser->pos = start;
-       return JSMN_ERROR_PART;
-#endif
-
-found:
-       if (tokens == NULL) {
-               parser->pos--;
-               return 0;
-       }
-       token = jsmn_alloc_token(parser, tokens, num_tokens);
-       if (token == NULL) {
-               parser->pos = start;
-               return JSMN_ERROR_NOMEM;
-       }
-       jsmn_fill_token(token, JSMN_PRIMITIVE, start, parser->pos);
-#ifdef JSMN_PARENT_LINKS
-       token->parent = parser->toksuper;
-#endif
-       parser->pos--;
-       return 0;
-}
-
-/**
- * Filsl next token with JSON string.
- */
-static jsmnerr_t jsmn_parse_string(jsmn_parser huge *parser, const char huge *js,
-               size_t len, jsmntok_t huge *tokens, size_t num_tokens) {
-       jsmntok_t huge *token;
-
-       int start = parser->pos;
-
-       parser->pos++;
-
-       /* Skip starting quote */
-       for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
-               char c = js[parser->pos];
-
-               /* Quote: end of string */
-               if (c == '\"') {
-                       if (tokens == NULL) {
-                               return 0;
-                       }
-                       token = jsmn_alloc_token(parser, tokens, num_tokens);
-                       if (token == NULL) {
-                               parser->pos = start;
-                               return JSMN_ERROR_NOMEM;
-                       }
-                       jsmn_fill_token(token, JSMN_STRING, start+1, parser->pos);
-#ifdef JSMN_PARENT_LINKS
-                       token->parent = parser->toksuper;
-#endif
-                       return 0;
-               }
-
-               /* Backslash: Quoted symbol expected */
-               if (c == '\\' && parser->pos + 1 < len) {
-                       int i;
-                       parser->pos++;
-                       switch (js[parser->pos]) {
-                               /* Allowed escaped symbols */
-                               case '\"': case '/' : case '\\' : case 'b' :
-                               case 'f' : case 'r' : case 'n'  : case 't' :
-                                       break;
-                               /* Allows escaped symbol \uXXXX */
-                               case 'u':
-                                       parser->pos++;
-                                       for(i = 0; i < 4 && parser->pos < len && js[parser->pos] != '\0'; i++) {
-                                               /* If it isn't a hex character we have an error */
-                                               if(!((js[parser->pos] >= 48 && js[parser->pos] <= 57) || /* 0-9 */
-                                                                       (js[parser->pos] >= 65 && js[parser->pos] <= 70) || /* A-F */
-                                                                       (js[parser->pos] >= 97 && js[parser->pos] <= 102))) { /* a-f */
-                                                       parser->pos = start;
-                                                       return JSMN_ERROR_INVAL;
-                                               }
-                                               parser->pos++;
-                                       }
-                                       parser->pos--;
-                                       break;
-                               /* Unexpected symbol */
-                               default:
-                                       parser->pos = start;
-                                       return JSMN_ERROR_INVAL;
-                       }
-               }
-       }
-       parser->pos = start;
-       return JSMN_ERROR_PART;
-}
-
-/**
- * Parse JSON string and fill tokens.
- */
-jsmnerr_t jsmn_parse(jsmn_parser huge *parser, const char huge *js, size_t len,
-               jsmntok_t huge *tokens, unsigned int num_tokens) {
-       jsmnerr_t r;
-       int i;
-       jsmntok_t huge *token;
-       int count = 0;
-       static unsigned long pee=0;
-
-       for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
-               char c;
-               jsmntype_t type;
-
-fprintf(stdout, "%lu   %c      count=%u        i=%d    nt=%u\n", pee, js[parser->pos], count, i, num_tokens);
-//fprintf(stdout, "token->start=%d\n", token->start);
-pee++;
-
-               c = js[parser->pos];
-               switch (c) {
-                       case '{': case '[':
-                               count++;
-                               if (tokens == NULL) {
-                                       break;
-                               }
-                               token = jsmn_alloc_token(parser, tokens, num_tokens);
-                               if (token == NULL)
-                                       return JSMN_ERROR_NOMEM;
-                               if (parser->toksuper != -1) {
-                                       tokens[parser->toksuper].size++;
-#ifdef JSMN_PARENT_LINKS
-                                       token->parent = parser->toksuper;
-#endif
-                               }
-                               token->type = (c == '{' ? JSMN_OBJECT : JSMN_ARRAY);
-                               token->start = parser->pos;
-                               parser->toksuper = parser->toknext - 1;
-                               break;
-                       case '}': case ']':
-                               if (tokens == NULL)
-                                       break;
-                               type = (c == '}' ? JSMN_OBJECT : JSMN_ARRAY);
-#ifdef JSMN_PARENT_LINKS
-                               if (parser->toknext < 1) {
-                                       return JSMN_ERROR_INVAL;
-                               }
-                               token = &tokens[parser->toknext - 1];
-                               for (;;) {
-                                       if (token->start != -1 && token->end == -1) {
-                                               if (token->type != type) {
-                                                       return JSMN_ERROR_INVAL;
-                                               }
-                                               token->end = parser->pos + 1;
-                                               parser->toksuper = token->parent;
-                                               break;
-                                       }
-                                       if (token->parent == -1) {
-                                               break;
-                                       }
-                                       token = &tokens[token->parent];
-                               }
-#else
-                               for (i = parser->toknext - 1; i >= 0; i--) {
-                                       token = &tokens[i];
-                                       if (token->start != -1 && token->end == -1) {
-                                               if (token->type != type) {
-                                                       return JSMN_ERROR_INVAL;
-                                               }
-                                               parser->toksuper = -1;
-                                               token->end = parser->pos + 1;
-                                               break;
-                                       }
-                               }
-                               /* Error if unmatched closing bracket */
-                               if (i == -1) return JSMN_ERROR_INVAL;
-                               for (; i >= 0; i--) {
-                                       token = &tokens[i];
-                                       if (token->start != -1 && token->end == -1) {
-                                               parser->toksuper = i;
-                                               break;
-                                       }
-                               }
-#endif
-                               break;
-                       case '\"':
-                               r = jsmn_parse_string(parser, js, len, tokens, num_tokens);
-                               if (r < 0) return r;
-                               count++;
-                               if (parser->toksuper != -1 && tokens != NULL)
-                                       tokens[parser->toksuper].size++;
-                               break;
-                       case '\t' : case '\r' : case '\n' : case ' ':
-                               break;
-                       case ':':
-                               parser->toksuper = parser->toknext - 1;
-                               break;
-                       case ',':
-                               if (tokens != NULL &&
-                                               tokens[parser->toksuper].type != JSMN_ARRAY &&
-                                               tokens[parser->toksuper].type != JSMN_OBJECT) {
-#ifdef JSMN_PARENT_LINKS
-                                       parser->toksuper = tokens[parser->toksuper].parent;
-#else
-                                       for (i = parser->toknext - 1; i >= 0; i--) {
-                                               if (tokens[i].type == JSMN_ARRAY || tokens[i].type == JSMN_OBJECT) {
-                                                       if (tokens[i].start != -1 && tokens[i].end == -1) {
-                                                               parser->toksuper = i;
-                                                               break;
-                                                       }
-                                               }
-                                       }
-#endif
-                               }
-                               break;
-#ifdef JSMN_STRICT
-                       /* In strict mode primitives are: numbers and booleans */
-                       case '-': case '0': case '1' : case '2': case '3' : case '4':
-                       case '5': case '6': case '7' : case '8': case '9':
-                       case 't': case 'f': case 'n' :
-                               /* And they must not be keys of the object */
-                               if (tokens != NULL) {
-                                       jsmntok_t huge *t = &tokens[parser->toksuper];
-                                       if (t->type == JSMN_OBJECT ||
-                                                       (t->type == JSMN_STRING && t->size != 0)) {
-                                               return JSMN_ERROR_INVAL;
-                                       }
-                               }
-#else
-                       /* In non-strict mode every unquoted value is a primitive */
-                       default:
-#endif
-                               r = jsmn_parse_primitive(parser, js, len, tokens, num_tokens);
-                               if (r < 0) return r;
-                               count++;
-                               if (parser->toksuper != -1 && tokens != NULL)
-                                       tokens[parser->toksuper].size++;
-                               break;
-
-#ifdef JSMN_STRICT
-                       /* Unexpected char in strict mode */
-                       default:
-                               return JSMN_ERROR_INVAL;
-#endif
-               }
-       }
-
-       for (i = parser->toknext - 1; i >= 0; i--) {
-               /* Unmatched opened object or array */
-               if (tokens[i].start != -1 && tokens[i].end == -1) {
-                       return JSMN_ERROR_PART;
-               }
-       }
-
-       return count;
-}
-
-/**
- * Creates a new parser based over a given  buffer with an array of tokens
- * available.
- */
-void jsmn_init(jsmn_parser huge *parser) {
-       parser->pos = 0;
-       parser->toknext = 0;
-       parser->toksuper = -1;
-}
-
diff --git a/src/lib/00jsmn00/farjsmn.h b/src/lib/00jsmn00/farjsmn.h
deleted file mode 100755 (executable)
index dd7dcaf..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-#ifndef __FARJSMN_H_
-#define __FARJSMN_H_
-
-#include <stddef.h>
-
-#define JSMN_PARENT_LINKS
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * JSON type identifier. Basic types are:
- *     o Object
- *     o Array
- *     o String
- *     o Other primitive: number, boolean (true/false) or null
- */
-typedef enum {
-       JSMN_PRIMITIVE = 0,
-       JSMN_OBJECT = 1,
-       JSMN_ARRAY = 2,
-       JSMN_STRING = 3
-} jsmntype_t;
-
-typedef enum {
-       /* Not enough tokens were provided */
-       JSMN_ERROR_NOMEM = -1,
-       /* Invalid character inside JSON string */
-       JSMN_ERROR_INVAL = -2,
-       /* The string is not a full JSON packet, more bytes expected */
-       JSMN_ERROR_PART = -3
-} jsmnerr_t;
-
-/**
- * JSON token description.
- * @param              type    type (object, array, string etc.)
- * @param              start   start position in JSON data string
- * @param              end             end position in JSON data string
- */
-typedef struct {
-       jsmntype_t type;
-       int start;
-       int end;
-       int size;
-#ifdef JSMN_PARENT_LINKS
-       int parent;
-#endif
-} jsmntok_t;
-
-/**
- * JSON parser. Contains an array of token blocks available. Also stores
- * the string being parsed now and current position in that string
- */
-typedef struct {
-       unsigned int pos; /* offset in the JSON string */
-       unsigned int toknext; /* next token to allocate */
-       int toksuper; /* superior token node, e.g parent object or array */
-} jsmn_parser;
-
-/**
- * Create JSON parser over an array of tokens
- */
-void jsmn_init(jsmn_parser huge *parser);
-
-/**
- * Run JSON parser. It parses a JSON data string into and array of tokens, each describing
- * a single JSON object.
- */
-jsmnerr_t jsmn_parse(jsmn_parser huge *parser, const char huge *js, size_t len,
-               jsmntok_t huge *tokens, unsigned int num_tokens);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __FARJSMN_H_ */
diff --git a/src/lib/00jsmn00/jsmn.c b/src/lib/00jsmn00/jsmn.c
deleted file mode 100755 (executable)
index a0f4f69..0000000
+++ /dev/null
@@ -1,311 +0,0 @@
-#include <stdlib.h>
-
-#include "jsmn.h"
-
-/**
- * Allocates a fresh unused token from the token pull.
- */
-static jsmntok_t *jsmn_alloc_token(jsmn_parser *parser,
-               jsmntok_t *tokens, size_t num_tokens) {
-       jsmntok_t *tok;
-       if (parser->toknext >= num_tokens) {
-               return NULL;
-       }
-       tok = &tokens[parser->toknext++];
-       tok->start = tok->end = -1;
-       tok->size = 0;
-#ifdef JSMN_PARENT_LINKS
-       tok->parent = -1;
-#endif
-       return tok;
-}
-
-/**
- * Fills token type and boundaries.
- */
-static void jsmn_fill_token(jsmntok_t *token, jsmntype_t type,
-                            int start, int end) {
-       token->type = type;
-       token->start = start;
-       token->end = end;
-       token->size = 0;
-}
-
-/**
- * Fills next available token with JSON primitive.
- */
-static jsmnerr_t jsmn_parse_primitive(jsmn_parser *parser, const char *js,
-               size_t len, jsmntok_t *tokens, size_t num_tokens) {
-       jsmntok_t *token;
-       int start;
-
-       start = parser->pos;
-
-       for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
-               switch (js[parser->pos]) {
-#ifndef JSMN_STRICT
-                       /* In strict mode primitive must be followed by "," or "}" or "]" */
-                       case ':':
-#endif
-                       case '\t' : case '\r' : case '\n' : case ' ' :
-                       case ','  : case ']'  : case '}' :
-                               goto found;
-               }
-               if (js[parser->pos] < 32 || js[parser->pos] >= 127) {
-                       parser->pos = start;
-                       return JSMN_ERROR_INVAL;
-               }
-       }
-#ifdef JSMN_STRICT
-       /* In strict mode primitive must be followed by a comma/object/array */
-       parser->pos = start;
-       return JSMN_ERROR_PART;
-#endif
-
-found:
-       if (tokens == NULL) {
-               parser->pos--;
-               return 0;
-       }
-       token = jsmn_alloc_token(parser, tokens, num_tokens);
-       if (token == NULL) {
-               parser->pos = start;
-               return JSMN_ERROR_NOMEM;
-       }
-       jsmn_fill_token(token, JSMN_PRIMITIVE, start, parser->pos);
-#ifdef JSMN_PARENT_LINKS
-       token->parent = parser->toksuper;
-#endif
-       parser->pos--;
-       return 0;
-}
-
-/**
- * Filsl next token with JSON string.
- */
-static jsmnerr_t jsmn_parse_string(jsmn_parser *parser, const char *js,
-               size_t len, jsmntok_t *tokens, size_t num_tokens) {
-       jsmntok_t *token;
-
-       int start = parser->pos;
-
-       parser->pos++;
-
-       /* Skip starting quote */
-       for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
-               char c = js[parser->pos];
-
-               /* Quote: end of string */
-               if (c == '\"') {
-                       if (tokens == NULL) {
-                               return 0;
-                       }
-                       token = jsmn_alloc_token(parser, tokens, num_tokens);
-                       if (token == NULL) {
-                               parser->pos = start;
-                               return JSMN_ERROR_NOMEM;
-                       }
-                       jsmn_fill_token(token, JSMN_STRING, start+1, parser->pos);
-#ifdef JSMN_PARENT_LINKS
-                       token->parent = parser->toksuper;
-#endif
-                       return 0;
-               }
-
-               /* Backslash: Quoted symbol expected */
-               if (c == '\\' && parser->pos + 1 < len) {
-                       int i;
-                       parser->pos++;
-                       switch (js[parser->pos]) {
-                               /* Allowed escaped symbols */
-                               case '\"': case '/' : case '\\' : case 'b' :
-                               case 'f' : case 'r' : case 'n'  : case 't' :
-                                       break;
-                               /* Allows escaped symbol \uXXXX */
-                               case 'u':
-                                       parser->pos++;
-                                       for(i = 0; i < 4 && parser->pos < len && js[parser->pos] != '\0'; i++) {
-                                               /* If it isn't a hex character we have an error */
-                                               if(!((js[parser->pos] >= 48 && js[parser->pos] <= 57) || /* 0-9 */
-                                                                       (js[parser->pos] >= 65 && js[parser->pos] <= 70) || /* A-F */
-                                                                       (js[parser->pos] >= 97 && js[parser->pos] <= 102))) { /* a-f */
-                                                       parser->pos = start;
-                                                       return JSMN_ERROR_INVAL;
-                                               }
-                                               parser->pos++;
-                                       }
-                                       parser->pos--;
-                                       break;
-                               /* Unexpected symbol */
-                               default:
-                                       parser->pos = start;
-                                       return JSMN_ERROR_INVAL;
-                       }
-               }
-       }
-       parser->pos = start;
-       return JSMN_ERROR_PART;
-}
-
-/**
- * Parse JSON string and fill tokens.
- */
-jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, size_t len,
-               jsmntok_t *tokens, unsigned int num_tokens) {
-       jsmnerr_t r;
-       int i;
-       jsmntok_t *token;
-       int count = 0;
-
-       for (; parser->pos < len && js[parser->pos] != '\0'; parser->pos++) {
-               char c;
-               jsmntype_t type;
-
-               c = js[parser->pos];
-               switch (c) {
-                       case '{': case '[':
-                               count++;
-                               if (tokens == NULL) {
-                                       break;
-                               }
-                               token = jsmn_alloc_token(parser, tokens, num_tokens);
-                               if (token == NULL)
-                                       return JSMN_ERROR_NOMEM;
-                               if (parser->toksuper != -1) {
-                                       tokens[parser->toksuper].size++;
-#ifdef JSMN_PARENT_LINKS
-                                       token->parent = parser->toksuper;
-#endif
-                               }
-                               token->type = (c == '{' ? JSMN_OBJECT : JSMN_ARRAY);
-                               token->start = parser->pos;
-                               parser->toksuper = parser->toknext - 1;
-                               break;
-                       case '}': case ']':
-                               if (tokens == NULL)
-                                       break;
-                               type = (c == '}' ? JSMN_OBJECT : JSMN_ARRAY);
-#ifdef JSMN_PARENT_LINKS
-                               if (parser->toknext < 1) {
-                                       return JSMN_ERROR_INVAL;
-                               }
-                               token = &tokens[parser->toknext - 1];
-                               for (;;) {
-                                       if (token->start != -1 && token->end == -1) {
-                                               if (token->type != type) {
-                                                       return JSMN_ERROR_INVAL;
-                                               }
-                                               token->end = parser->pos + 1;
-                                               parser->toksuper = token->parent;
-                                               break;
-                                       }
-                                       if (token->parent == -1) {
-                                               break;
-                                       }
-                                       token = &tokens[token->parent];
-                               }
-#else
-                               for (i = parser->toknext - 1; i >= 0; i--) {
-                                       token = &tokens[i];
-                                       if (token->start != -1 && token->end == -1) {
-                                               if (token->type != type) {
-                                                       return JSMN_ERROR_INVAL;
-                                               }
-                                               parser->toksuper = -1;
-                                               token->end = parser->pos + 1;
-                                               break;
-                                       }
-                               }
-                               /* Error if unmatched closing bracket */
-                               if (i == -1) return JSMN_ERROR_INVAL;
-                               for (; i >= 0; i--) {
-                                       token = &tokens[i];
-                                       if (token->start != -1 && token->end == -1) {
-                                               parser->toksuper = i;
-                                               break;
-                                       }
-                               }
-#endif
-                               break;
-                       case '\"':
-                               r = jsmn_parse_string(parser, js, len, tokens, num_tokens);
-                               if (r < 0) return r;
-                               count++;
-                               if (parser->toksuper != -1 && tokens != NULL)
-                                       tokens[parser->toksuper].size++;
-                               break;
-                       case '\t' : case '\r' : case '\n' : case ' ':
-                               break;
-                       case ':':
-                               parser->toksuper = parser->toknext - 1;
-                               break;
-                       case ',':
-                               if (tokens != NULL &&
-                                               tokens[parser->toksuper].type != JSMN_ARRAY &&
-                                               tokens[parser->toksuper].type != JSMN_OBJECT) {
-#ifdef JSMN_PARENT_LINKS
-                                       parser->toksuper = tokens[parser->toksuper].parent;
-#else
-                                       for (i = parser->toknext - 1; i >= 0; i--) {
-                                               if (tokens[i].type == JSMN_ARRAY || tokens[i].type == JSMN_OBJECT) {
-                                                       if (tokens[i].start != -1 && tokens[i].end == -1) {
-                                                               parser->toksuper = i;
-                                                               break;
-                                                       }
-                                               }
-                                       }
-#endif
-                               }
-                               break;
-#ifdef JSMN_STRICT
-                       /* In strict mode primitives are: numbers and booleans */
-                       case '-': case '0': case '1' : case '2': case '3' : case '4':
-                       case '5': case '6': case '7' : case '8': case '9':
-                       case 't': case 'f': case 'n' :
-                               /* And they must not be keys of the object */
-                               if (tokens != NULL) {
-                                       jsmntok_t *t = &tokens[parser->toksuper];
-                                       if (t->type == JSMN_OBJECT ||
-                                                       (t->type == JSMN_STRING && t->size != 0)) {
-                                               return JSMN_ERROR_INVAL;
-                                       }
-                               }
-#else
-                       /* In non-strict mode every unquoted value is a primitive */
-                       default:
-#endif
-                               r = jsmn_parse_primitive(parser, js, len, tokens, num_tokens);
-                               if (r < 0) return r;
-                               count++;
-                               if (parser->toksuper != -1 && tokens != NULL)
-                                       tokens[parser->toksuper].size++;
-                               break;
-
-#ifdef JSMN_STRICT
-                       /* Unexpected char in strict mode */
-                       default:
-                               return JSMN_ERROR_INVAL;
-#endif
-               }
-       }
-
-       for (i = parser->toknext - 1; i >= 0; i--) {
-               /* Unmatched opened object or array */
-               if (tokens[i].start != -1 && tokens[i].end == -1) {
-                       return JSMN_ERROR_PART;
-               }
-       }
-
-       return count;
-}
-
-/**
- * Creates a new parser based over a given  buffer with an array of tokens
- * available.
- */
-void jsmn_init(jsmn_parser *parser) {
-       parser->pos = 0;
-       parser->toknext = 0;
-       parser->toksuper = -1;
-}
-
diff --git a/src/lib/00jsmn00/jsmn.h b/src/lib/00jsmn00/jsmn.h
deleted file mode 100755 (executable)
index 95fb2ca..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-#ifndef __JSMN_H_
-#define __JSMN_H_
-
-#include <stddef.h>
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/**
- * JSON type identifier. Basic types are:
- *     o Object
- *     o Array
- *     o String
- *     o Other primitive: number, boolean (true/false) or null
- */
-typedef enum {
-       JSMN_PRIMITIVE = 0,
-       JSMN_OBJECT = 1,
-       JSMN_ARRAY = 2,
-       JSMN_STRING = 3
-} jsmntype_t;
-
-typedef enum {
-       /* Not enough tokens were provided */
-       JSMN_ERROR_NOMEM = -1,
-       /* Invalid character inside JSON string */
-       JSMN_ERROR_INVAL = -2,
-       /* The string is not a full JSON packet, more bytes expected */
-       JSMN_ERROR_PART = -3
-} jsmnerr_t;
-
-/**
- * JSON token description.
- * @param              type    type (object, array, string etc.)
- * @param              start   start position in JSON data string
- * @param              end             end position in JSON data string
- */
-typedef struct {
-       jsmntype_t type;
-       int start;
-       int end;
-       int size;
-#ifdef JSMN_PARENT_LINKS
-       int parent;
-#endif
-} jsmntok_t;
-
-/**
- * JSON parser. Contains an array of token blocks available. Also stores
- * the string being parsed now and current position in that string
- */
-typedef struct {
-       unsigned int pos; /* offset in the JSON string */
-       unsigned int toknext; /* next token to allocate */
-       int toksuper; /* superior token node, e.g parent object or array */
-} jsmn_parser;
-
-/**
- * Create JSON parser over an array of tokens
- */
-void jsmn_init(jsmn_parser *parser);
-
-/**
- * Run JSON parser. It parses a JSON data string into and array of tokens, each describing
- * a single JSON object.
- */
-jsmnerr_t jsmn_parse(jsmn_parser *parser, const char *js, size_t len,
-               jsmntok_t *tokens, unsigned int num_tokens);
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* __JSMN_H_ */
diff --git a/src/lib/00jsmn00/jsmn_test b/src/lib/00jsmn00/jsmn_test
deleted file mode 100755 (executable)
index eb420fe..0000000
Binary files a/src/lib/00jsmn00/jsmn_test and /dev/null differ
diff --git a/src/lib/00jsmn00/jsmn_test.c b/src/lib/00jsmn00/jsmn_test.c
deleted file mode 100755 (executable)
index 3968859..0000000
+++ /dev/null
@@ -1,608 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-static int test_passed = 0;
-static int test_failed = 0;
-
-/* Terminate current test with error */
-#define fail() return __LINE__
-
-/* Successfull end of the test case */
-#define done() return 0
-
-/* Check single condition */
-#define check(cond) do { if (!(cond)) fail(); } while (0)
-
-/* Test runner */
-static void test(int (*func)(void), const char *name) {
-       int r = func();
-       if (r == 0) {
-               test_passed++;
-       } else {
-               test_failed++;
-               printf("FAILED: %s (at line %d)\n", name, r);
-       }
-}
-
-#define TOKEN_EQ(t, tok_start, tok_end, tok_type) \
-       ((t).start == tok_start \
-        && (t).end == tok_end  \
-        && (t).type == (tok_type))
-
-#define TOKEN_STRING(js, t, s) \
-       (strncmp(js+(t).start, s, (t).end - (t).start) == 0 \
-        && strlen(s) == (t).end - (t).start)
-
-#define TOKEN_PRINT(t) \
-       printf("start: %d, end: %d, type: %d, size: %d\n", \
-                       (t).start, (t).end, (t).type, (t).size)
-
-#define JSMN_STRICT
-#include "jsmn.c"
-
-int test_empty() {
-       const char *js;
-       int r;
-       jsmn_parser p;
-       jsmntok_t t[10];
-
-       js = "{}";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), t, 10);
-       check(r >= 0);
-       check(t[0].type == JSMN_OBJECT);
-       check(t[0].start == 0 && t[0].end == 2);
-
-       js = "[]";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), t, 10);
-       check(r >= 0);
-       check(t[0].type == JSMN_ARRAY);
-       check(t[0].start == 0 && t[0].end == 2);
-
-       js = "{\"a\":[]}";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), t, 10);
-       check(r >= 0);
-       check(t[0].type == JSMN_OBJECT && t[0].start == 0 && t[0].end == 8);
-       check(t[1].type == JSMN_STRING && t[1].start == 2 && t[1].end == 3);
-       check(t[2].type == JSMN_ARRAY && t[2].start == 5 && t[2].end == 7);
-
-       js = "[{},{}]";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), t, 10);
-       check(r >= 0);
-       check(t[0].type == JSMN_ARRAY && t[0].start == 0 && t[0].end == 7);
-       check(t[1].type == JSMN_OBJECT && t[1].start == 1 && t[1].end == 3);
-       check(t[2].type == JSMN_OBJECT && t[2].start == 4 && t[2].end == 6);
-       return 0;
-}
-
-int test_simple() {
-       const char *js;
-       int r;
-       jsmn_parser p;
-       jsmntok_t tokens[10];
-
-       js = "{\"a\": 0}";
-
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tokens, 10);
-       check(r >= 0);
-       check(TOKEN_EQ(tokens[0], 0, 8, JSMN_OBJECT));
-       check(TOKEN_EQ(tokens[1], 2, 3, JSMN_STRING));
-       check(TOKEN_EQ(tokens[2], 6, 7, JSMN_PRIMITIVE));
-
-       check(TOKEN_STRING(js, tokens[0], js));
-       check(TOKEN_STRING(js, tokens[1], "a"));
-       check(TOKEN_STRING(js, tokens[2], "0"));
-
-       jsmn_init(&p);
-       js = "[\"a\":{},\"b\":{}]";
-       r = jsmn_parse(&p, js, strlen(js), tokens, 10);
-       check(r >= 0);
-
-       jsmn_init(&p);
-       js = "{\n \"Day\": 26,\n \"Month\": 9,\n \"Year\": 12\n }";
-       r = jsmn_parse(&p, js, strlen(js), tokens, 10);
-       check(r >= 0);
-
-       return 0;
-}
-
-int test_primitive() {
-#ifndef JSMN_STRICT
-       int r;
-       jsmn_parser p;
-       jsmntok_t tok[10];
-       const char *js;
-       js = "\"boolVar\" : true";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tok, 10);
-       check(r >= 0 && tok[0].type == JSMN_STRING
-                       && tok[1].type == JSMN_PRIMITIVE);
-       check(TOKEN_STRING(js, tok[0], "boolVar"));
-       check(TOKEN_STRING(js, tok[1], "true"));
-
-       js = "\"boolVar\" : false";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tok, 10);
-       check(r >= 0 && tok[0].type == JSMN_STRING
-                       && tok[1].type == JSMN_PRIMITIVE);
-       check(TOKEN_STRING(js, tok[0], "boolVar"));
-       check(TOKEN_STRING(js, tok[1], "false"));
-
-       js = "\"intVar\" : 12345";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tok, 10);
-       check(r >= 0 && tok[0].type == JSMN_STRING
-                       && tok[1].type == JSMN_PRIMITIVE);
-       check(TOKEN_STRING(js, tok[0], "intVar"));
-       check(TOKEN_STRING(js, tok[1], "12345"));
-
-       js = "\"floatVar\" : 12.345";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tok, 10);
-       check(r >= 0 && tok[0].type == JSMN_STRING
-                       && tok[1].type == JSMN_PRIMITIVE);
-       check(TOKEN_STRING(js, tok[0], "floatVar"));
-       check(TOKEN_STRING(js, tok[1], "12.345"));
-
-       js = "\"nullVar\" : null";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tok, 10);
-       check(r >= 0 && tok[0].type == JSMN_STRING
-                       && tok[1].type == JSMN_PRIMITIVE);
-       check(TOKEN_STRING(js, tok[0], "nullVar"));
-       check(TOKEN_STRING(js, tok[1], "null"));
-#endif
-       return 0;
-}
-
-int test_string() {
-       int r;
-       jsmn_parser p;
-       jsmntok_t tok[10];
-       const char *js;
-
-       js = "\"strVar\" : \"hello world\"";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tok, 10);
-       check(r >= 0 && tok[0].type == JSMN_STRING
-                       && tok[1].type == JSMN_STRING);
-       check(TOKEN_STRING(js, tok[0], "strVar"));
-       check(TOKEN_STRING(js, tok[1], "hello world"));
-
-       js = "\"strVar\" : \"escapes: \\/\\r\\n\\t\\b\\f\\\"\\\\\"";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tok, 10);
-       check(r >= 0 && tok[0].type == JSMN_STRING
-                       && tok[1].type == JSMN_STRING);
-       check(TOKEN_STRING(js, tok[0], "strVar"));
-       check(TOKEN_STRING(js, tok[1], "escapes: \\/\\r\\n\\t\\b\\f\\\"\\\\"));
-
-       js = "\"strVar\" : \"\"";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tok, 10);
-       check(r >= 0 && tok[0].type == JSMN_STRING
-                       && tok[1].type == JSMN_STRING);
-       check(TOKEN_STRING(js, tok[0], "strVar"));
-       check(TOKEN_STRING(js, tok[1], ""));
-
-       return 0;
-}
-
-int test_partial_string() {
-       int r;
-       jsmn_parser p;
-       jsmntok_t tok[10];
-       const char *js;
-
-       jsmn_init(&p);
-       js = "\"x\": \"va";
-       r = jsmn_parse(&p, js, strlen(js), tok, 10);
-       check(r == JSMN_ERROR_PART && tok[0].type == JSMN_STRING);
-       check(TOKEN_STRING(js, tok[0], "x"));
-       check(p.toknext == 1);
-
-       jsmn_init(&p);
-       char js_slash[9] = "\"x\": \"va\\";
-       r = jsmn_parse(&p, js_slash, sizeof(js_slash), tok, 10);
-       check(r == JSMN_ERROR_PART);
-
-       jsmn_init(&p);
-       char js_unicode[10] = "\"x\": \"va\\u";
-       r = jsmn_parse(&p, js_unicode, sizeof(js_unicode), tok, 10);
-       check(r == JSMN_ERROR_PART);
-
-       js = "\"x\": \"valu";
-       r = jsmn_parse(&p, js, strlen(js), tok, 10);
-       check(r == JSMN_ERROR_PART && tok[0].type == JSMN_STRING);
-       check(TOKEN_STRING(js, tok[0], "x"));
-       check(p.toknext == 1);
-
-       js = "\"x\": \"value\"";
-       r = jsmn_parse(&p, js, strlen(js), tok, 10);
-       check(r >= 0 && tok[0].type == JSMN_STRING
-                       && tok[1].type == JSMN_STRING);
-       check(TOKEN_STRING(js, tok[0], "x"));
-       check(TOKEN_STRING(js, tok[1], "value"));
-
-       js = "\"x\": \"value\", \"y\": \"value y\"";
-       r = jsmn_parse(&p, js, strlen(js), tok, 10);
-       check(r >= 0 && tok[0].type == JSMN_STRING
-                       && tok[1].type == JSMN_STRING && tok[2].type == JSMN_STRING
-                       && tok[3].type == JSMN_STRING);
-       check(TOKEN_STRING(js, tok[0], "x"));
-       check(TOKEN_STRING(js, tok[1], "value"));
-       check(TOKEN_STRING(js, tok[2], "y"));
-       check(TOKEN_STRING(js, tok[3], "value y"));
-
-       return 0;
-}
-
-int test_unquoted_keys() {
-#ifndef JSMN_STRICT
-       int r;
-       jsmn_parser p;
-       jsmntok_t tok[10];
-       const char *js;
-
-       jsmn_init(&p);
-       js = "key1: \"value\"\nkey2 : 123";
-
-       r = jsmn_parse(&p, js, strlen(js), tok, 10);
-       check(r >= 0 && tok[0].type == JSMN_PRIMITIVE
-                       && tok[1].type == JSMN_STRING && tok[2].type == JSMN_PRIMITIVE
-                       && tok[3].type == JSMN_PRIMITIVE);
-       check(TOKEN_STRING(js, tok[0], "key1"));
-       check(TOKEN_STRING(js, tok[1], "value"));
-       check(TOKEN_STRING(js, tok[2], "key2"));
-       check(TOKEN_STRING(js, tok[3], "123"));
-#endif
-       return 0;
-}
-
-int test_partial_array() {
-       int r;
-       jsmn_parser p;
-       jsmntok_t tok[10];
-       const char *js;
-
-       jsmn_init(&p);
-       js = "  [ 1, true, ";
-       r = jsmn_parse(&p, js, strlen(js), tok, 10);
-       check(r == JSMN_ERROR_PART && tok[0].type == JSMN_ARRAY
-                       && tok[1].type == JSMN_PRIMITIVE && tok[2].type == JSMN_PRIMITIVE);
-
-       js = "  [ 1, true, [123, \"hello";
-       r = jsmn_parse(&p, js, strlen(js), tok, 10);
-       check(r == JSMN_ERROR_PART && tok[0].type == JSMN_ARRAY
-                       && tok[1].type == JSMN_PRIMITIVE && tok[2].type == JSMN_PRIMITIVE
-                       && tok[3].type == JSMN_ARRAY && tok[4].type == JSMN_PRIMITIVE);
-
-       js = "  [ 1, true, [123, \"hello\"]";
-       r = jsmn_parse(&p, js, strlen(js), tok, 10);
-       check(r == JSMN_ERROR_PART && tok[0].type == JSMN_ARRAY
-                       && tok[1].type == JSMN_PRIMITIVE && tok[2].type == JSMN_PRIMITIVE
-                       && tok[3].type == JSMN_ARRAY && tok[4].type == JSMN_PRIMITIVE
-                       && tok[5].type == JSMN_STRING);
-       /* check child nodes of the 2nd array */
-       check(tok[3].size == 2);
-
-       js = "  [ 1, true, [123, \"hello\"]]";
-       r = jsmn_parse(&p, js, strlen(js), tok, 10);
-       check(r >= 0 && tok[0].type == JSMN_ARRAY
-                       && tok[1].type == JSMN_PRIMITIVE && tok[2].type == JSMN_PRIMITIVE
-                       && tok[3].type == JSMN_ARRAY && tok[4].type == JSMN_PRIMITIVE
-                       && tok[5].type == JSMN_STRING);
-       check(tok[3].size == 2);
-       check(tok[0].size == 3);
-       return 0;
-}
-
-int test_array_nomem() {
-       int i;
-       int r;
-       jsmn_parser p;
-       jsmntok_t toksmall[10], toklarge[10];
-       const char *js;
-
-       js = "  [ 1, true, [123, \"hello\"]]";
-
-       for (i = 0; i < 6; i++) {
-               jsmn_init(&p);
-               memset(toksmall, 0, sizeof(toksmall));
-               memset(toklarge, 0, sizeof(toklarge));
-               r = jsmn_parse(&p, js, strlen(js), toksmall, i);
-               check(r == JSMN_ERROR_NOMEM);
-
-               memcpy(toklarge, toksmall, sizeof(toksmall));
-
-               r = jsmn_parse(&p, js, strlen(js), toklarge, 10);
-               check(r >= 0);
-
-               check(toklarge[0].type == JSMN_ARRAY && toklarge[0].size == 3);
-               check(toklarge[3].type == JSMN_ARRAY && toklarge[3].size == 2);
-       }
-       return 0;
-}
-
-int test_objects_arrays() {
-       int r;
-       jsmn_parser p;
-       jsmntok_t tokens[10];
-       const char *js;
-
-       js = "[10}";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tokens, 10);
-       check(r == JSMN_ERROR_INVAL);
-
-       js = "[10]";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tokens, 10);
-       check(r >= 0);
-
-       js = "{\"a\": 1]";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tokens, 10);
-       check(r == JSMN_ERROR_INVAL);
-
-       js = "{\"a\": 1}";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tokens, 10);
-       check(r >= 0);
-
-       return 0;
-}
-
-int test_issue_22() {
-       int r;
-       jsmn_parser p;
-       jsmntok_t tokens[128];
-       const char *js;
-
-       js = "{ \"height\":10, \"layers\":[ { \"data\":[6,6], \"height\":10, "
-               "\"name\":\"Calque de Tile 1\", \"opacity\":1, \"type\":\"tilelayer\", "
-               "\"visible\":true, \"width\":10, \"x\":0, \"y\":0 }], "
-               "\"orientation\":\"orthogonal\", \"properties\": { }, \"tileheight\":32, "
-               "\"tilesets\":[ { \"firstgid\":1, \"image\":\"..\\/images\\/tiles.png\", "
-               "\"imageheight\":64, \"imagewidth\":160, \"margin\":0, \"name\":\"Tiles\", "
-               "\"properties\":{}, \"spacing\":0, \"tileheight\":32, \"tilewidth\":32 }], "
-               "\"tilewidth\":32, \"version\":1, \"width\":10 }";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tokens, 128);
-       check(r >= 0);
-#if 0
-       for (i = 1; tokens[i].end < tokens[0].end; i++) {
-               if (tokens[i].type == JSMN_STRING || tokens[i].type == JSMN_PRIMITIVE) {
-                       printf("%.*s\n", tokens[i].end - tokens[i].start, js + tokens[i].start);
-               } else if (tokens[i].type == JSMN_ARRAY) {
-                       printf("[%d elems]\n", tokens[i].size);
-               } else if (tokens[i].type == JSMN_OBJECT) {
-                       printf("{%d elems}\n", tokens[i].size);
-               } else {
-                       TOKEN_PRINT(tokens[i]);
-               }
-       }
-#endif
-       return 0;
-}
-
-int test_unicode_characters() {
-       jsmn_parser p;
-       jsmntok_t tokens[10];
-       const char *js;
-
-       int r;
-       js = "{\"a\":\"\\uAbcD\"}";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tokens, 10);
-       check(r >= 0);
-
-       js = "{\"a\":\"str\\u0000\"}";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tokens, 10);
-       check(r >= 0);
-
-       js = "{\"a\":\"\\uFFFFstr\"}";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tokens, 10);
-       check(r >= 0);
-
-       js = "{\"a\":\"str\\uFFGFstr\"}";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tokens, 10);
-       check(r == JSMN_ERROR_INVAL);
-
-       js = "{\"a\":\"str\\u@FfF\"}";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tokens, 10);
-       check(r == JSMN_ERROR_INVAL);
-
-       js = "{\"a\":[\"\\u028\"]}";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tokens, 10);
-       check(r == JSMN_ERROR_INVAL);
-
-       js = "{\"a\":[\"\\u0280\"]}";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tokens, 10);
-       check(r >= 0);
-
-       return 0;
-}
-
-int test_input_length() {
-       const char *js;
-       int r;
-       jsmn_parser p;
-       jsmntok_t tokens[10];
-
-       js = "{\"a\": 0}garbage";
-
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, 8, tokens, 10);
-       check(r == 3);
-       check(TOKEN_STRING(js, tokens[0], "{\"a\": 0}"));
-       check(TOKEN_STRING(js, tokens[1], "a"));
-       check(TOKEN_STRING(js, tokens[2], "0"));
-
-       return 0;
-}
-
-int test_count() {
-       jsmn_parser p;
-       const char *js;
-
-       js = "{}";
-       jsmn_init(&p);
-       check(jsmn_parse(&p, js, strlen(js), NULL, 0) == 1);
-
-       js = "[]";
-       jsmn_init(&p);
-       check(jsmn_parse(&p, js, strlen(js), NULL, 0) == 1);
-
-       js = "[[]]";
-       jsmn_init(&p);
-       check(jsmn_parse(&p, js, strlen(js), NULL, 0) == 2);
-
-       js = "[[], []]";
-       jsmn_init(&p);
-       check(jsmn_parse(&p, js, strlen(js), NULL, 0) == 3);
-
-       js = "[[], []]";
-       jsmn_init(&p);
-       check(jsmn_parse(&p, js, strlen(js), NULL, 0) == 3);
-
-       js = "[[], [[]], [[], []]]";
-       jsmn_init(&p);
-       check(jsmn_parse(&p, js, strlen(js), NULL, 0) == 7);
-
-       js = "[\"a\", [[], []]]";
-       jsmn_init(&p);
-       check(jsmn_parse(&p, js, strlen(js), NULL, 0) == 5);
-
-       js = "[[], \"[], [[]]\", [[]]]";
-       jsmn_init(&p);
-       check(jsmn_parse(&p, js, strlen(js), NULL, 0) == 5);
-
-       js = "[1, 2, 3]";
-       jsmn_init(&p);
-       check(jsmn_parse(&p, js, strlen(js), NULL, 0) == 4);
-
-       js = "[1, 2, [3, \"a\"], null]";
-       jsmn_init(&p);
-       check(jsmn_parse(&p, js, strlen(js), NULL, 0) == 7);
-
-       return 0;
-}
-
-int test_keyvalue() {
-       const char *js;
-       int r;
-       jsmn_parser p;
-       jsmntok_t tokens[10];
-
-       js = "{\"a\": 0, \"b\": \"c\"}";
-
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tokens, 10);
-       check(r == 5);
-       check(tokens[0].size == 2); /* two keys */
-       check(tokens[1].size == 1 && tokens[3].size == 1); /* one value per key */
-       check(tokens[2].size == 0 && tokens[4].size == 0); /* values have zero size */
-
-       js = "{\"a\"\n0}";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tokens, 10);
-       check(r == JSMN_ERROR_INVAL);
-
-       js = "{\"a\", 0}";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tokens, 10);
-       check(r == JSMN_ERROR_INVAL);
-
-       js = "{\"a\": {2}}";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tokens, 10);
-       check(r == JSMN_ERROR_INVAL);
-
-       js = "{\"a\": {2: 3}}";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tokens, 10);
-       check(r == JSMN_ERROR_INVAL);
-
-
-       js = "{\"a\": {\"a\": 2 3}}";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tokens, 10);
-       check(r == JSMN_ERROR_INVAL);
-       return 0;
-}
-
-/** A huge redefinition of everything to include jsmn in non-script mode */
-#define jsmn_init jsmn_init_nonstrict
-#define jsmn_parse jsmn_parse_nonstrict
-#define jsmn_parser jsmn_parser_nonstrict
-#define jsmn_alloc_token jsmn_alloc_token_nonstrict
-#define jsmn_fill_token jsmn_fill_token_nonstrict
-#define jsmn_parse_primitive jsmn_parse_primitive_nonstrict
-#define jsmn_parse_string jsmn_parse_string_nonstrict
-#define jsmntype_t jsmntype_nonstrict_t
-#define jsmnerr_t jsmnerr_nonstrict_t
-#define jsmntok_t jsmntok_nonstrict_t
-#define JSMN_PRIMITIVE JSMN_PRIMITIVE_NONSTRICT
-#define JSMN_OBJECT JSMN_OBJECT_NONSTRICT
-#define JSMN_ARRAY JSMN_ARRAY_NONSTRICT
-#define JSMN_STRING JSMN_STRING_NONSTRICT
-#define JSMN_ERROR_NOMEM JSMN_ERROR_NOMEM_NONSTRICT
-#define JSMN_ERROR_INVAL JSMN_ERROR_INVAL_NONSTRICT
-#define JSMN_ERROR_PART JSMN_ERROR_PART_NONSTRICT
-#undef __JSMN_H_
-#undef JSMN_STRICT
-#include "jsmn.c"
-
-int test_nonstrict() {
-       const char *js;
-       int r;
-       jsmn_parser p;
-       jsmntok_t tokens[10];
-
-       js = "a: 0garbage";
-
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, 4, tokens, 10);
-       check(r == 2);
-       check(TOKEN_STRING(js, tokens[0], "a"));
-       check(TOKEN_STRING(js, tokens[1], "0"));
-
-       js = "Day : 26\nMonth : Sep\n\nYear: 12";
-       jsmn_init(&p);
-       r = jsmn_parse(&p, js, strlen(js), tokens, 10);
-       check(r == 6);
-       return 0;
-}
-
-int main() {
-       test(test_empty, "general test for a empty JSON objects/arrays");
-       test(test_simple, "general test for a simple JSON string");
-       test(test_primitive, "test primitive JSON data types");
-       test(test_string, "test string JSON data types");
-       test(test_partial_string, "test partial JSON string parsing");
-       test(test_partial_array, "test partial array reading");
-       test(test_array_nomem, "test array reading with a smaller number of tokens");
-       test(test_unquoted_keys, "test unquoted keys (like in JavaScript)");
-       test(test_objects_arrays, "test objects and arrays");
-       test(test_unicode_characters, "test unicode characters");
-       test(test_input_length, "test strings that are not null-terminated");
-       test(test_issue_22, "test issue #22");
-       test(test_count, "test tokens count estimation");
-       test(test_nonstrict, "test for non-strict mode");
-       test(test_keyvalue, "test for keys/values");
-       printf("\nPASSED: %d\nFAILED: %d\n", test_passed, test_failed);
-       return 0;
-}
-
index 762f554369eee280c12d1d2616902c64c6eebb57..cd3b2ec75858ffd3d8d14dde176a7609c856a6b6 100755 (executable)
--- a/test.map
+++ b/test.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (32-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/01 13:49:51
+Created on:       15/10/01 13:56:58
 Executable Image: test.exe
 creating a DOS executable
 
index 5560558ebc25eaa7ce12621460b7c5da238d6f7e..5ed1cdf6492c2cc166873ebcee53dd41c5ca2220 100755 (executable)
--- a/test2.map
+++ b/test2.map
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (32-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/01 13:49:51
+Created on:       15/10/01 13:56:58
 Executable Image: test2.exe
 creating a DOS executable
 
index 9473c94c31a1e332d19a71352a0c282bac313725..c04d0b0f62b8962d44cec403c0af7bd69ce3cf10 100755 (executable)
@@ -1,7 +1,7 @@
 Open Watcom Linker Version 2.0 beta Sep 21 2015 09:27:06 (32-bit)
 Copyright (c) 2002-2015 The Open Watcom Contributors. All Rights Reserved.
 Portions Copyright (c) 1985-2002 Sybase, Inc. All Rights Reserved.
-Created on:       15/10/01 13:49:51
+Created on:       15/10/01 13:56:58
 Executable Image: vgmtest.exe
 creating a DOS executable