Skip to content

Commit

Permalink
parse_number_state
Browse files Browse the repository at this point in the history
  • Loading branch information
@danielaparker
danielaparker committed Jan 8, 2025
1 parent ea8c00f commit 5da3e76
Showing 1 changed file with 76 additions and 61 deletions.
137 changes: 76 additions & 61 deletions include/jsoncons/json_parser.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,14 +59,7 @@ enum class parse_state : uint8_t
array,
string,
member_name,
minus,
zero,
integer,
fraction1,
fraction2,
exp1,
exp2,
exp3,
number,
n,
nu,
nul,
Expand Down Expand Up @@ -97,6 +90,18 @@ enum class parse_string_state : uint8_t
escape_u8
};

enum class parse_number_state : uint8_t
{
minus,
zero,
integer,
fraction1,
fraction2,
exp1,
exp2,
exp3
};

template <typename CharT,typename TempAllocator = std::allocator<char>>
class basic_json_parser : public ser_context
{
Expand Down Expand Up @@ -135,7 +140,8 @@ class basic_json_parser : public ser_context
const char_type* end_input_;
const char_type* input_ptr_;
parse_state state_;
parse_string_state string_state_;
parse_string_state string_state_ = parse_string_state{};
parse_number_state number_state_ = parse_number_state{};
bool more_;
bool done_;

Expand Down Expand Up @@ -183,7 +189,6 @@ class basic_json_parser : public ser_context
end_input_(nullptr),
input_ptr_(nullptr),
state_(parse_state::start),
string_state_{},
more_(true),
done_(false),
string_buffer_(temp_alloc),
Expand Down Expand Up @@ -579,15 +584,23 @@ class basic_json_parser : public ser_context
{
switch (state_)
{
case parse_state::zero:
case parse_state::integer:
end_integer_value(visitor, ec);
if (ec) return;
break;
case parse_state::fraction2:
case parse_state::exp3:
end_fraction_value(visitor, ec);
if (ec) return;
case parse_state::number:
if (number_state_ == parse_number_state::zero || number_state_ == parse_number_state::integer)
{
end_integer_value(visitor, ec);
if (ec) return;
}
else if (number_state_ == parse_number_state::fraction2 || number_state_ == parse_number_state::exp3)
{
end_fraction_value(visitor, ec);
if (ec) return;
}
else
{
err_handler_(json_errc::unexpected_eof, *this);
ec = json_errc::unexpected_eof;
more_ = false;
}
break;
case parse_state::accept:
visitor.flush();
Expand Down Expand Up @@ -701,14 +714,16 @@ class basic_json_parser : public ser_context
saved_position_ = position_;
++input_ptr_;
++position_;
state_ = parse_state::minus;
state_ = parse_state::number;
number_state_ = parse_number_state::minus;
parse_number(visitor, ec);
if (ec) {return;}
break;
case '0':
string_buffer_.clear();
string_buffer_.push_back(static_cast<char>(*input_ptr_));
state_ = parse_state::zero;
state_ = parse_state::number;
number_state_ = parse_number_state::zero;
saved_position_ = position_;
++input_ptr_;
++position_;
Expand All @@ -721,7 +736,8 @@ class basic_json_parser : public ser_context
saved_position_ = position_;
++input_ptr_;
++position_;
state_ = parse_state::integer;
state_ = parse_state::number;
number_state_ = parse_number_state::integer;
parse_number(visitor, ec);
if (ec) {return;}
break;
Expand Down Expand Up @@ -1113,7 +1129,8 @@ class basic_json_parser : public ser_context
saved_position_ = position_;
++input_ptr_;
++position_;
state_ = parse_state::minus;
state_ = parse_state::number;
number_state_ = parse_number_state::minus;
parse_number(visitor, ec);
if (ec) {return;}
break;
Expand All @@ -1123,7 +1140,8 @@ class basic_json_parser : public ser_context
saved_position_ = position_;
++input_ptr_;
++position_;
state_ = parse_state::zero;
state_ = parse_state::number;
number_state_ = parse_number_state::zero;
parse_number(visitor, ec);
if (ec) {return;}
break;
Expand All @@ -1133,7 +1151,8 @@ class basic_json_parser : public ser_context
saved_position_ = position_;
++input_ptr_;
++position_;
state_ = parse_state::integer;
state_ = parse_state::number;
number_state_ = parse_number_state::integer;
parse_number(visitor, ec);
if (ec) {return;}
break;
Expand Down Expand Up @@ -1269,7 +1288,8 @@ class basic_json_parser : public ser_context
saved_position_ = position_;
++input_ptr_;
++position_;
state_ = parse_state::minus;
state_ = parse_state::number;
number_state_ = parse_number_state::minus;
parse_number(visitor, ec);
if (ec) {return;}
break;
Expand All @@ -1279,7 +1299,8 @@ class basic_json_parser : public ser_context
saved_position_ = position_;
++input_ptr_;
++position_;
state_ = parse_state::zero;
state_ = parse_state::number;
number_state_ = parse_number_state::zero;
parse_number(visitor, ec);
if (ec) {return;}
break;
Expand All @@ -1289,7 +1310,8 @@ class basic_json_parser : public ser_context
saved_position_ = position_;
++input_ptr_;
++position_;
state_ = parse_state::integer;
state_ = parse_state::number;
number_state_ = parse_number_state::integer;
parse_number(visitor, ec);
if (ec) {return;}
break;
Expand Down Expand Up @@ -1332,14 +1354,7 @@ class basic_json_parser : public ser_context
parse_string(visitor, ec);
if (ec) return;
break;
case parse_state::minus:
case parse_state::zero:
case parse_state::integer:
case parse_state::fraction1:
case parse_state::fraction2:
case parse_state::exp1:
case parse_state::exp2:
case parse_state::exp3:
case parse_state::number:
parse_number(visitor, ec);
if (ec) return;
break;
Expand Down Expand Up @@ -1725,31 +1740,31 @@ class basic_json_parser : public ser_context
{
const char_type* local_input_end = end_input_;

switch (state_)
switch (number_state_)
{
case parse_state::minus:
case parse_number_state::minus:
goto minus_sign;
case parse_state::zero:
case parse_number_state::zero:
goto zero;
case parse_state::integer:
case parse_number_state::integer:
goto integer;
case parse_state::fraction1:
case parse_number_state::fraction1:
goto fraction1;
case parse_state::fraction2:
case parse_number_state::fraction2:
goto fraction2;
case parse_state::exp1:
case parse_number_state::exp1:
goto exp1;
case parse_state::exp2:
case parse_number_state::exp2:
goto exp2;
case parse_state::exp3:
case parse_number_state::exp3:
goto exp3;
default:
JSONCONS_UNREACHABLE();
}
minus_sign:
if (JSONCONS_UNLIKELY(input_ptr_ >= local_input_end)) // Buffer exhausted
{
state_ = parse_state::minus;
number_state_ = parse_number_state::minus;
return;
}
switch (*input_ptr_)
Expand All @@ -1773,7 +1788,7 @@ class basic_json_parser : public ser_context
zero:
if (JSONCONS_UNLIKELY(input_ptr_ >= local_input_end)) // Buffer exhausted
{
state_ = parse_state::zero;
number_state_ = parse_number_state::zero;
return;
}
switch (*input_ptr_)
Expand Down Expand Up @@ -1835,19 +1850,19 @@ class basic_json_parser : public ser_context
err_handler_(json_errc::leading_zero, *this);
ec = json_errc::leading_zero;
more_ = false;
state_ = parse_state::zero;
number_state_ = parse_number_state::zero;
return;
default:
err_handler_(json_errc::invalid_number, *this);
ec = json_errc::invalid_number;
more_ = false;
state_ = parse_state::zero;
number_state_ = parse_number_state::zero;
return;
}
integer:
if (JSONCONS_UNLIKELY(input_ptr_ >= local_input_end)) // Buffer exhausted
{
state_ = parse_state::integer;
number_state_ = parse_number_state::integer;
return;
}
switch (*input_ptr_)
Expand Down Expand Up @@ -1914,13 +1929,13 @@ class basic_json_parser : public ser_context
err_handler_(json_errc::invalid_number, *this);
ec = json_errc::invalid_number;
more_ = false;
state_ = parse_state::integer;
number_state_ = parse_number_state::integer;
return;
}
fraction1:
if (JSONCONS_UNLIKELY(input_ptr_ >= local_input_end)) // Buffer exhausted
{
state_ = parse_state::fraction1;
number_state_ = parse_number_state::fraction1;
return;
}
switch (*input_ptr_)
Expand All @@ -1934,13 +1949,13 @@ class basic_json_parser : public ser_context
err_handler_(json_errc::invalid_number, *this);
ec = json_errc::invalid_number;
more_ = false;
state_ = parse_state::fraction1;
number_state_ = parse_number_state::fraction1;
return;
}
fraction2:
if (JSONCONS_UNLIKELY(input_ptr_ >= local_input_end)) // Buffer exhausted
{
state_ = parse_state::fraction2;
number_state_ = parse_number_state::fraction2;
return;
}
switch (*input_ptr_)
Expand Down Expand Up @@ -2006,13 +2021,13 @@ class basic_json_parser : public ser_context
err_handler_(json_errc::invalid_number, *this);
ec = json_errc::invalid_number;
more_ = false;
state_ = parse_state::fraction2;
number_state_ = parse_number_state::fraction2;
return;
}
exp1:
if (JSONCONS_UNLIKELY(input_ptr_ >= local_input_end)) // Buffer exhausted
{
state_ = parse_state::exp1;
number_state_ = parse_number_state::exp1;
return;
}
switch (*input_ptr_)
Expand All @@ -2035,13 +2050,13 @@ class basic_json_parser : public ser_context
err_handler_(json_errc::invalid_number, *this);
ec = json_errc::expected_value;
more_ = false;
state_ = parse_state::exp1;
number_state_ = parse_number_state::exp1;
return;
}
exp2:
if (JSONCONS_UNLIKELY(input_ptr_ >= local_input_end)) // Buffer exhausted
{
state_ = parse_state::exp2;
number_state_ = parse_number_state::exp2;
return;
}
switch (*input_ptr_)
Expand All @@ -2055,14 +2070,14 @@ class basic_json_parser : public ser_context
err_handler_(json_errc::invalid_number, *this);
ec = json_errc::expected_value;
more_ = false;
state_ = parse_state::exp2;
number_state_ = parse_number_state::exp2;
return;
}

exp3:
if (JSONCONS_UNLIKELY(input_ptr_ >= local_input_end)) // Buffer exhausted
{
state_ = parse_state::exp3;
number_state_ = parse_number_state::exp3;
return;
}
switch (*input_ptr_)
Expand Down Expand Up @@ -2123,7 +2138,7 @@ class basic_json_parser : public ser_context
err_handler_(json_errc::invalid_number, *this);
ec = json_errc::invalid_number;
more_ = false;
state_ = parse_state::exp3;
number_state_ = parse_number_state::exp3;
return;
}

Expand Down

0 comments on commit 5da3e76

Please sign in to comment.