mirror of
https://github.com/deltachat/deltachat-core.git
synced 2025-10-03 17:59:19 +02:00
for now, move jsmn json parser to src/ for easier bindings
This commit is contained in:
B. Petersen
parent
d92b5f4a9d
commit
379a1fe993
7 changed files with 51 additions and 194 deletions
|
|
@ -11,7 +11,7 @@
|
||||||
<Option object_output="obj/Debug/" />
|
<Option object_output="obj/Debug/" />
|
||||||
<Option type="1" />
|
<Option type="1" />
|
||||||
<Option compiler="gcc" />
|
<Option compiler="gcc" />
|
||||||
<Option parameters="/home/bpetersen/messy/mailboxes/messenger.db" />
|
<Option parameters="/home/bpetersen/messy/mailboxes/messenger-gmail-susi.db" />
|
||||||
<Compiler>
|
<Compiler>
|
||||||
<Add option="-g" />
|
<Add option="-g" />
|
||||||
</Compiler>
|
</Compiler>
|
||||||
|
|
@ -65,9 +65,6 @@
|
||||||
<Unit filename="cmdline/stress.c">
|
<Unit filename="cmdline/stress.c">
|
||||||
<Option compilerVar="CC" />
|
<Option compilerVar="CC" />
|
||||||
</Unit>
|
</Unit>
|
||||||
<Unit filename="libs/jsmn/jsmn.c">
|
|
||||||
<Option compilerVar="CC" />
|
|
||||||
</Unit>
|
|
||||||
<Unit filename="libs/libetpan/src/data-types/base64.c">
|
<Unit filename="libs/libetpan/src/data-types/base64.c">
|
||||||
<Option compilerVar="CC" />
|
<Option compilerVar="CC" />
|
||||||
</Unit>
|
</Unit>
|
||||||
|
|
@ -470,6 +467,9 @@
|
||||||
<Unit filename="src/dc_jobthread.c">
|
<Unit filename="src/dc_jobthread.c">
|
||||||
<Option compilerVar="CC" />
|
<Option compilerVar="CC" />
|
||||||
</Unit>
|
</Unit>
|
||||||
|
<Unit filename="src/dc_jsmn.c">
|
||||||
|
<Option compilerVar="CC" />
|
||||||
|
</Unit>
|
||||||
<Unit filename="src/dc_key.c">
|
<Unit filename="src/dc_key.c">
|
||||||
<Option compilerVar="CC" />
|
<Option compilerVar="CC" />
|
||||||
</Unit>
|
</Unit>
|
||||||
|
|
|
||||||
|
|
@ -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.
|
|
||||||
|
|
||||||
|
|
@ -1,168 +0,0 @@
|
||||||
JSMN
|
|
||||||
====
|
|
||||||
|
|
||||||
[](https://travis-ci.org/zserge/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 https://github.com/zserge/jsmn
|
|
||||||
|
|
||||||
The web page with some information about jsmn can be found at
|
|
||||||
[http://zserge.com/jsmn.html][2]
|
|
||||||
|
|
||||||
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). And 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 Git installed. Just run:
|
|
||||||
|
|
||||||
$ git clone https://github.com/zserge/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_UNDEFINED = 0,
|
|
||||||
JSMN_OBJECT = 1,
|
|
||||||
JSMN_ARRAY = 2,
|
|
||||||
JSMN_STRING = 3,
|
|
||||||
JSMN_PRIMITIVE = 4
|
|
||||||
} 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, strlen(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 return 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 `JSMN_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 `JSMN_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]: http://zserge.com/jsmn.html
|
|
||||||
|
|
@ -1,4 +1,26 @@
|
||||||
#include "jsmn.h"
|
/*
|
||||||
|
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.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include "dc_jsmn.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Allocates a fresh unused token from the token pool.
|
* Allocates a fresh unused token from the token pool.
|
||||||
|
|
@ -1,3 +1,25 @@
|
||||||
|
/*
|
||||||
|
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.
|
||||||
|
*/
|
||||||
|
|
||||||
#ifndef __JSMN_H_
|
#ifndef __JSMN_H_
|
||||||
#define __JSMN_H_
|
#define __JSMN_H_
|
||||||
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
#include "dc_context.h"
|
#include "dc_context.h"
|
||||||
#include "dc_oauth2.h"
|
#include "dc_oauth2.h"
|
||||||
#include "../libs/jsmn/jsmn.h"
|
#include "dc_jsmn.h"
|
||||||
|
|
||||||
|
|
||||||
static int jsoneq(const char *json, jsmntok_t *tok, const char *s) {
|
static int jsoneq(const char *json, jsmntok_t *tok, const char *s) {
|
||||||
|
|
|
||||||
|
|
@ -40,6 +40,7 @@ lib_src = [
|
||||||
'dc_strencode.c',
|
'dc_strencode.c',
|
||||||
'dc_token.c',
|
'dc_token.c',
|
||||||
'dc_tools.c',
|
'dc_tools.c',
|
||||||
|
'dc_jsmn.c',
|
||||||
]
|
]
|
||||||
|
|
||||||
lib_deps = [pthreads, zlib, openssl, sasl, sqlite, etpan, netpgp, math]
|
lib_deps = [pthreads, zlib, openssl, sasl, sqlite, etpan, netpgp, math]
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue