Commit Graph

  • fdceddf685 Merge pull request #61 from elelay/master Serge Zaitsev 2015-12-08 08:34:46 +08:00
  • 6bfa20872c fix jsmntype_t definition in README Eric Le Lay 2015-12-07 20:14:07 +01:00
  • 8da639a334 Merge pull request #60 from baskerville/master Serge Zaitsev 2015-11-19 17:04:51 +08:00
  • f06a10c1b7 Fix typo Bastien Dejean 2015-11-19 09:55:46 +01:00
  • 076abddc19 fixed privitive value typo in tests Serge A. Zaitsev 2015-10-31 18:43:04 +02:00
  • 7fb89f1eb2 initialized ok variable in tests, parse should still return 1 if expected result is a failure Serge A. Zaitsev 2015-10-31 18:37:25 +02:00
  • 8a5ee3d41b fixed a typo in the test name Serge A. Zaitsev 2015-10-31 18:33:43 +02:00
  • 2db03781c5 Merge pull request #55 from goriy/example_realloc_fix Serge Zaitsev 2015-10-25 22:42:48 +02:00
  • 2d185aa465 tiny realloc function wrapper which handles cases of realloc failures goriy 2015-10-25 23:28:19 +03:00
  • e709651a20 small fix of jsondump example for cases of realloc failures goriy 2015-10-24 23:32:51 +03:00
  • 0c2d60b8e7 added and marked as fixme tests for false positives in objects Serge A. Zaitsev 2015-10-17 15:25:44 +02:00
  • f7e6dcb7a2 added another test of invalid array Serge A. Zaitsev 2015-10-17 15:24:44 +02:00
  • e5fb875b59 added another test of invalid array Serge A. Zaitsev 2015-10-17 15:19:01 +02:00
  • aedc121ce8 added check for null pointer before fixing tokens after parsing is done Serge A. Zaitsev 2015-10-17 15:14:13 +02:00
  • 824d9a769c applied fix from wireshark Serge A. Zaitsev 2015-10-17 15:09:35 +02:00
  • d0664f9a2e changed jsmnerr_t type to int Serge A. Zaitsev 2015-10-17 15:06:39 +02:00
  • 5e37daeec3 added issue 27 test case Serge A. Zaitsev 2015-10-17 15:01:01 +02:00
  • edd751896d fixed return value on incremental parting Serge A. Zaitsev 2015-10-17 14:58:47 +02:00
  • 9b4e33199f moved tests into a subfolder, added table-driven tests Serge A. Zaitsev 2015-10-17 14:58:31 +02:00
  • 226f318224 json token type enum doesn't start with zero value anymore, fixes #24 Serge A. Zaitsev 2015-10-17 10:50:22 +02:00
  • d87c22d2cd removed mixed declarations and code, fixes #45 Serge A. Zaitsev 2015-10-17 10:42:30 +02:00
  • 6809c029aa changed test function args to void, fixes #46 Serge A. Zaitsev 2015-10-17 10:39:27 +02:00
  • 6cb9c3721d test exit status depends on number of failed tests Serge A. Zaitsev 2015-10-17 10:29:54 +02:00
  • bd9bd55c3a Changed links to github Serge Zaitsev 2015-09-24 18:22:14 +02:00
  • 26193d39c2 updated README Serge A. Zaitsev 2014-12-19 01:40:26 +02:00
  • cf38b7d171 added js string boundaries checks for string parser, fixes issue #31; added tests to cover it; fixed makefile to use custom cflags/ldflags Serge A. Zaitsev 2014-11-17 16:21:36 +02:00
  • 91d7389ec8 added some tests for key/values nodes and added some stricter validations Serge A. Zaitsev 2014-11-17 15:36:18 +02:00
  • 946a2b1e02 moved i declaration to the top of the block, issue #38 fixed Serge A. Zaitsev 2014-11-17 15:06:12 +02:00
  • a0e2b876ca including stddef.h in the jsmn.h, fixed issue #28 Serge A. Zaitsev 2014-11-17 14:28:27 +02:00
  • 838061aa96 removed trailing spaces Serge A. Zaitsev 2014-11-17 14:14:45 +02:00
  • 8a22e0a149 implemented key/value hierarchy; added 2 examples; fixed some warnings in tests Serge A. Zaitsev 2014-11-17 14:13:58 +02:00
  • e0847b52b5 Merged in setekhid/jsmn/setekhid/jsmnh2822-warning-commas-at-the-end-of-e-1408807731663 (pull request #11) Serge Zaitsev 2014-10-09 19:49:10 +03:00
  • cf39341a39 jsmn.h:28:22: warning: commas at the end of enumerator lists are a C99-specific feature [-Wc99-extensions] Wizard Tai 2014-08-23 15:28:58 +00:00
  • 76cd398859 removed JSMN_SUCCESS value from the readme Serge A. Zaitsev 2014-02-21 11:04:16 +02:00
  • f2864e69b9 Merged in MacGritsch/jsmn-patch (pull request #7) Serge Zaitsev 2014-02-21 11:03:29 +02:00
  • db379ec124 Added "extern C" to use it with CPP. Gabriel Gritsch 2014-02-21 09:53:45 +01:00
  • a89501b2fb Integrate changes made by Serge Zaitsev. Gabriel Gritsch 2014-02-21 09:52:23 +01:00
  • 5faee057cb edited readme about what's inside the repo. closes issue #19 Serge A. Zaitsev 2014-02-21 00:24:29 +02:00
  • f0ae25f873 added way to specify json string length, added test for non-strict mode Serge A. Zaitsev 2014-02-21 00:11:52 +02:00
  • 809c7c6db1 added way to estimate number of tokens before parsing Serge A. Zaitsev 2014-02-20 22:27:07 +02:00
  • 733b8e958e Changes for SIZE_MAX Gabriel Gritsch 2014-02-16 10:54:19 +01:00
  • c91adceded - Added possibility to specify the lenght of the input buffer (if not null-terminated). - Added "extern C" to use it with CPP. Gabriel Gritsch 2014-02-16 10:45:20 +01:00
  • 659842c65c - Added possibility to specify the lenght of the input buffer (if not null-terminated). - Added "extern C" to use it with CPP. Gabriel Gritsch 2014-02-16 10:42:27 +01:00
  • 385b42e740 - Added possibility to specify the lenght of the input buffer (if not null-terminated). - Added "extern C" to use it with CPP. Gabriel Gritsch 2014-02-12 17:53:45 +01:00
  • 86350f2bb1 a proper fix for signed comparison Serge A. Zaitsev 2014-02-09 17:09:15 +02:00
  • da95978033 added cast size_t to int to avoid warnings, removed string.h header since it was merged by accident Serge A. Zaitsev 2014-02-09 17:04:39 +02:00
  • d0ca2df480 fixed jsmntype_t definition Serge A. Zaitsev 2014-01-27 17:11:54 +02:00
  • c29d151bfa added link to the web page Serge A. Zaitsev 2014-01-27 16:04:43 +02:00
  • 2b0e4464c7 Merged in frnknstn/jsmn/markdown (pull request #5) Serge Zaitsev 2014-01-27 16:09:33 +02:00
  • 323395efac Merged in frnknstn/jsmn/clean (pull request #4) Serge Zaitsev 2014-01-27 16:08:19 +02:00
  • 40392b73e3 fixed indentation and comments style after merge Serge A. Zaitsev 2014-01-27 15:58:43 +02:00
  • e397f0dfb6 rename README so markdown renders in source control Peter Finlayson 2013-12-23 12:39:00 +02:00
  • ee10da0f1e delete jsmn_test.exe when doing make clean Peter Finlayson 2013-12-23 12:29:33 +02:00
  • 07af5df94b Removes the incorrect counting of tokens del6597 2013-07-19 00:23:58 -04:00
  • f190d18a52 Adds checking to unicode characters that are \uXXXX where X is a hexidecimal digit Adds new tests for unicode character coverage del6597 2013-07-19 00:15:49 -04:00
  • 6f4e2f7a56 Added a method for jsmn_estimate_tokens(const char *json); del6597 2013-07-17 00:05:47 -04:00
  • 958c758f2e fixed: invalid object/arrays were passed successfully in tree mode; added tests for this case Serge A. Zaitsev 2012-10-22 21:54:46 +03:00
  • 3d6fb06ee9 fixed typo Serge A. Zaitsev 2012-10-01 12:43:37 +03:00
  • cf172e71d7 fixed tests: missing jsmn_init() before parsing; added tests for empty arrays/objects Serge A. Zaitsev 2012-10-01 11:15:48 +03:00
  • e0ceee893c fixed strict mode: space symbols are allowed after primitives; added some new tests Serge A. Zaitsev 2012-09-26 20:28:12 +03:00
  • 37964b40ee added optional parent token pointer support. Increases parsing speed Serge A. Zaitsev 2012-09-26 20:19:21 +03:00
  • cfbb5b5091 removed unused variable Serge A. Zaitsev 2012-09-23 20:30:56 +03:00
  • 974133db85 tokens array items are now being initialized during allocation, removed redundant code that significantly slowed down the parser Serge A. Zaitsev 2012-09-23 20:29:48 +03:00
  • e542dea54e changed return value to jsmnerr_t, fixed warning about signed/unsigned values Serge A. Zaitsev 2012-09-03 19:54:40 +03:00
  • af04595fe2 fix: error is returned if brackets are unmatched Serge A. Zaitsev 2012-02-02 14:05:47 +02:00
  • f3b41ae30c fixed: superior node size is now an index, not a pointer (safe to realloc) Serge A. Zaitsev 2012-02-02 13:26:15 +02:00
  • a983a76061 added reading with small number of tokens test, fixed NOMEM issue #2 Serge A. Zaitsev 2012-02-02 13:15:22 +02:00
  • 53454e5429 added test for partial array reading Serge A. Zaitsev 2012-02-02 11:40:36 +02:00
  • 41171ecd51 fixed typo, added JSMN_STRICT mode Serge A. Zaitsev 2012-02-01 17:51:42 +02:00
  • e395ad562e added one more test case for partial string parser Serge A. Zaitsev 2012-02-01 17:18:32 +02:00
  • 30f932772e tested partial parser for strings, added primitive string parser test, fixed token allocation Serge A. Zaitsev 2012-02-01 17:15:54 +02:00
  • 929e233756 added tests for primitive types, primitive types now can be stored outside the objects without braces Serge A. Zaitsev 2012-02-01 16:03:36 +02:00
  • 443be365f6 removed JSON string and token array from parser internals, because they must not be saved between parse() calls Serge A. Zaitsev 2012-02-01 14:02:12 +02:00
  • bed0a7a3e6 changed API: parse now is more flexible, but init jsut resets the parser; added new test macro to compate strings, fixed Makefile Serge A. Zaitsev 2012-02-01 13:56:06 +02:00
  • 4b5c5ed66a switched to C unit-tests instead of bash Serge A. Zaitsev 2012-02-01 12:38:51 +02:00
  • 2928f7ec0e renamed: get_token to alloc_token Serge A. Zaitsev 2012-02-01 12:38:05 +02:00
  • 0c22b772ed using system AR program, build options are moved to config.mk Serge A. Zaitsev 2012-01-30 14:03:36 +02:00
  • d6209011a5 added download links in README Serge A. Zaitsev 2011-09-15 18:43:48 +03:00
  • d6f48a6a3d fixed: issue #1, thanks to m_einman for his patch Serge A. Zaitsev 2011-03-28 13:32:44 +03:00
  • 42be9208f7 README updated Serge A. Zaitsev 2010-12-28 12:06:52 +02:00
  • 4e869f7e9e Complex types (objects and arrays) now have also size - number of child elements Serge A. Zaitsev 2010-12-28 11:16:41 +02:00
  • c4d9412483 Some comments added in json.c Serge A. Zaitsev 2010-12-27 17:05:22 +02:00
  • c955364a95 All objects renamed using jsmn prefix to keep consistency and not be mixed with other json libraries. Demo is now called just demo. Serge A. Zaitsev 2010-12-27 17:00:24 +02:00
  • 4e29ee705f Fix: check if no tokens lefs, return error in that case Serge Zaitsev 2010-12-26 13:48:13 +02:00
  • 9924734575 Typo in tests fixed. Argument variable quoted Serge Zaitsev 2010-12-26 13:02:40 +02:00
  • 3d94cd0a18 Removed useless argument from printf Serge A. Zaitsev 2010-11-29 13:53:13 +02:00
  • 2cf5193d64 README changed. Now it is a template for the official web page Serge A. Zaitsev 2010-11-29 13:52:11 +02:00
  • 978ea959f4 Added test for a large number of tokens Serge A. Zaitsev 2010-11-24 11:15:21 +02:00
  • 508bf43fa0 Test framework implemented Serge Zaitsev 2010-11-24 00:54:21 +02:00
  • f88240ac2e Simplified demo output format Serge Zaitsev 2010-11-24 00:26:15 +02:00
  • 23b8487783 Demo: option added to specify buffer size when reading Serge A. Zaitsev 2010-11-22 14:52:46 +02:00
  • 8e31e4d214 jsmn: strings start from the first char after quotes Serge A. Zaitsev 2010-11-22 14:52:26 +02:00
  • b91dee9102 Demo: declarations moved to the top of functions. Serge A. Zaitsev 2010-11-17 17:33:29 +02:00
  • 7a027a4dd2 Token manipulation functions changes. size_t replaced with unsigned int. Serge A. Zaitsev 2010-11-17 15:16:12 +02:00
  • 3922360800 Demo: options added. Number of tokens can be specified now. Serge A. Zaitsev 2010-11-17 12:19:38 +02:00
  • 991ca5dd94 Demo: can now read from stdin Serge A. Zaitsev 2010-11-17 12:05:29 +02:00
  • d0d52f6847 Design: primitive type implemented as a replacement to boolean/number/null. String tokens point to the unquoted string Serge A. Zaitsev 2010-11-17 12:03:26 +02:00
  • 60509e2850 Design: rewritten using parser structure Serge A. Zaitsev 2010-11-16 15:41:49 +02:00
  • a2755a7595 Design: some error codes added Serge A. Zaitsev 2010-11-16 13:50:13 +02:00
  • daf93a0ebd Feature: make difference between numbers and other primitives Serge A. Zaitsev 2010-11-16 11:56:08 +02:00