Skip to content

parser.c: Refactor start pointers #1010

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
byroot merged 1 commit into from
Jun 16, 2026
+16 −19
Merged

parser.c: Refactor start pointers #1010

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 16 additions & 19 deletions ext/json/ext/parser/parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1543,6 +1543,8 @@ ALWAYS_INLINE(static) bool json_parse_any(JSON_ParserState *state, JSON_ParserCo
json_eat_whitespace(state, config);

VALUE value;
const char *value_start = state->cursor;

switch (peek(state)) {
case 'n':
json_match_keyword(state, "null", 0);
Expand Down Expand Up @@ -1578,13 +1580,12 @@ ALWAYS_INLINE(static) bool json_parse_any(JSON_ParserState *state, JSON_ParserCo
break;

case '-': {
const char *start = state->cursor;
state->cursor++;

value = json_parse_number(state, config, true, start);
value = json_parse_number(state, config, true, value_start);

if (RB_UNLIKELY(UNDEF_P(value) && config->allow_nan && peek(state) == 'I')) {
state->cursor = start;
state->cursor = value_start;
json_match_keyword(state, "-Infinity", 1);
value = CMinusInfinity;
break;
Expand All @@ -1593,51 +1594,49 @@ ALWAYS_INLINE(static) bool json_parse_any(JSON_ParserState *state, JSON_ParserCo
// Top level numbers are ambiguous when parsing streams, we can't
// know if we parsed all the digits if we hit EOS.
if (RB_UNLIKELY(resumable && eos(state))) {
state->cursor = start;
state->cursor = value_start;
return false;
}

if (RB_UNLIKELY(UNDEF_P(value))) {
raise_syntax_error_at("invalid number: %s", state, start);
raise_syntax_error_at("invalid number: %s", state, value_start);
}
break;
}

case '0': case '1': case '2': case '3': case '4': case '5': case '6': case '7': case '8': case '9': {
const char *start = state->cursor;

value = json_parse_number(state, config, false, start);
value = json_parse_number(state, config, false, value_start);

// Top level numbers are ambiguous when parsing streams, we can't
// know if we parsed all the digits if we hit EOS.
if (RB_UNLIKELY(resumable && eos(state))) {
state->cursor = start;
state->cursor = value_start;
return false;
}

if (RB_UNLIKELY(UNDEF_P(value))) {
raise_syntax_error_at("invalid number: %s", state, start);
raise_syntax_error_at("invalid number: %s", state, value_start);
}
break;
}

case '"': {
// %r{\A"[^"\\\t\n\x00]*(?:\\[bfnrtu\\/"][^"\\]*)*"}
const char *start = state->cursor;
value = json_parse_string(state, config, false);

if (RB_UNLIKELY(UNDEF_P(value))) {
bool is_eos = eos(state);
if (resumable) {
state->cursor = start;
if (resumable && is_eos) {
state->cursor = value_start;
return false;
}
raise_parse_error("unexpected end of input, expected closing \"", state, is_eos);
}
break;
}

case '[': {
const char *start = state->cursor++;
state->cursor++;
json_eat_whitespace(state, config);

const char next = peek(state);
Expand All @@ -1646,7 +1645,7 @@ ALWAYS_INLINE(static) bool json_parse_any(JSON_ParserState *state, JSON_ParserCo
value = json_decode_array(state, config, 0);
break;
} else if (resumable && next == 0) {
state->cursor = start;
state->cursor = value_start;
return false;
}

Expand All @@ -1666,8 +1665,6 @@ ALWAYS_INLINE(static) bool json_parse_any(JSON_ParserState *state, JSON_ParserCo
}

case '{': {
const char *object_start_cursor = state->cursor;

state->cursor++;
json_eat_whitespace(state, config);

Expand All @@ -1676,7 +1673,7 @@ ALWAYS_INLINE(static) bool json_parse_any(JSON_ParserState *state, JSON_ParserCo
value = json_decode_object(state, config, 0);
break;
} else if (resumable && eos(state)) {
state->cursor = object_start_cursor;
state->cursor = value_start;
return false;
}

Expand All @@ -1690,7 +1687,7 @@ ALWAYS_INLINE(static) bool json_parse_any(JSON_ParserState *state, JSON_ParserCo
.type = JSON_FRAME_OBJECT,
.phase = JSON_PHASE_OBJECT_KEY,
.value_stack_head = state->value_stack->head,
.start_offset = object_start_cursor - state->start,
.start_offset = value_start - state->start,
});
goto JSON_PHASE_OBJECT_KEY;
}
Expand Down
Loading