mirror/cJSON
1
0
Fork 0
mirror of https://github.com/DaveGamble/cJSON.git synced 2023-08-10 21:13:26 +03:00
Code Issues Projects Releases Wiki Activity

feature: add support for C-style comments

Browse Source 
Both inline comments `/* ... */` and trailing comments `// ...` are supported.
This commit is contained in:
Zhang Rui 2023-02-17 18:43:19 +08:00 committed by GitHub
parent b45f48e600
commit dd663e2ab9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
cJSON.c
View File

@ -1033,6 +1033,55 @@ static cJSON_bool parse_array(cJSON * const item, parse_buffer * const input_buf
static cJSON_bool print_array(const cJSON * const item, printbuffer * const output_buffer);
static cJSON_bool parse_object(cJSON * const item, parse_buffer * const input_buffer);
static cJSON_bool print_object(const cJSON * const item, printbuffer * const output_buffer);
static parse_buffer *buffer_skip_whitespace(parse_buffer * const buffer);
/* Utility to skip comments */
static parse_buffer *buffer_skip_comment(parse_buffer * const buffer)
{
if ((buffer == NULL) || (buffer->content == NULL))
{
return NULL;
}
if (cannot_access_at_index(buffer, 0) || cannot_access_at_index(buffer, 1))
{
return buffer;
}
if (buffer_at_offset(buffer)[0] == '/' && buffer_at_offset(buffer)[1] == '/')
{
buffer->offset += 2; // skipping '/' '/'
while (can_access_at_index(buffer, 0) && !(buffer_at_offset(buffer)[0] == '\n'))
{
buffer->offset++;
}
buffer->offset++; // skipping '\n'
buffer_skip_whitespace(buffer); // continue to trim whitespaces afterwards
}
if ((buffer_at_offset(buffer)[0] == '/') && (buffer_at_offset(buffer)[1] == '*'))
{
/* skipping '/' '*' */
buffer->offset += 2;
while (can_access_at_index(buffer, 0) && can_access_at_index(buffer, 1) &&
!(buffer_at_offset(buffer)[0] == '*' && buffer_at_offset(buffer)[0] == '/'))
{
buffer->offset++;
}
/* skipping '*' '/' */
buffer->offset += 2;
/* continue to trim whitespaces afterwards */
buffer_skip_whitespace(buffer);
}
if (buffer->offset == buffer->length)
{
buffer->offset--;
}
return buffer;
}
/* Utility to jump whitespace and cr/lf */
static parse_buffer *buffer_skip_whitespace(parse_buffer * const buffer)
@ -1052,6 +1101,8 @@ static parse_buffer *buffer_skip_whitespace(parse_buffer * const buffer)
buffer->offset++;
}
buffer_skip_comments(buffer);
if (buffer->offset == buffer->length)
{
buffer->offset--;