summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorToni Uhlig <matzeton@googlemail.com>2021-09-15 17:03:59 +0200
committerToni Uhlig <matzeton@googlemail.com>2021-09-15 17:03:59 +0200
commit8e096b19c1e0b45ccd43cc89d9d80b59bd783529 (patch)
tree2fe9f17fd22f42e26497a4c4c178ec5ac036f6e2
parent053d3cd29200edb1bfd181d917d140c16c1f8834 (diff)
Squashed 'dependencies/jsmn/' changes from 053d3cd..1aa2e8f
1aa2e8f Update README.md (#203) b85f161 Update README.md (#213) 23f13d2 Merge pull request #108 from olmokramer/patch-1 git-subtree-dir: dependencies/jsmn git-subtree-split: 1aa2e8f80849c983466b165d53542da9b1bd1b32
-rw-r--r--README.md10
-rw-r--r--jsmn.h8
2 files changed, 9 insertions, 9 deletions
diff --git a/README.md b/README.md
index f8249f3dd..e94679775 100644
--- a/README.md
+++ b/README.md
@@ -89,7 +89,7 @@ jsmn_parser p;
jsmntok_t t[128]; /* We expect no more than 128 JSON tokens */
jsmn_init(&p);
-r = jsmn_parse(&p, s, strlen(s), t, 128);
+r = jsmn_parse(&p, s, strlen(s), t, 128); // "s" is the char array holding the json content
```
Since jsmn is a single-header, header-only library, for more complex use cases
@@ -113,10 +113,10 @@ Token types are described by `jsmntype_t`:
typedef enum {
JSMN_UNDEFINED = 0,
- JSMN_OBJECT = 1,
- JSMN_ARRAY = 2,
- JSMN_STRING = 3,
- JSMN_PRIMITIVE = 4
+ JSMN_OBJECT = 1 << 0,
+ JSMN_ARRAY = 1 << 1,
+ JSMN_STRING = 1 << 2,
+ JSMN_PRIMITIVE = 1 << 3
} jsmntype_t;
**Note:** Unlike JSON data types, primitive tokens are not divided into
diff --git a/jsmn.h b/jsmn.h
index 3178dcc97..41219b7dd 100644
--- a/jsmn.h
+++ b/jsmn.h
@@ -45,10 +45,10 @@ extern "C" {
*/
typedef enum {
JSMN_UNDEFINED = 0,
- JSMN_OBJECT = 1,
- JSMN_ARRAY = 2,
- JSMN_STRING = 3,
- JSMN_PRIMITIVE = 4
+ JSMN_OBJECT = 1 << 0,
+ JSMN_ARRAY = 1 << 1,
+ JSMN_STRING = 1 << 2,
+ JSMN_PRIMITIVE = 1 << 3
} jsmntype_t;
enum jsmnerr {