josh/propane
1
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

Allow switching on Decoder.Result

Browse Source
This commit is contained in:
Josh Holtrop 2023-07-04 12:49:54 -04:00
parent 9895733a05
commit 02d99082b2
1 changed files with 34 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
assets/parser.d.erb
View File

@ -73,44 +73,30 @@ class <%= @classname %>
{ {
struct Result struct Result
{ {
enum Type enum
{ {
SUCCESS, SUCCESS,
EOF, EOF,
DECODE_ERROR, DECODE_ERROR,
} }
private Type type; private ubyte type;
alias type this;
CodePoint code_point; CodePoint code_point;
uint code_point_length; uint code_point_length;
static Result success(CodePoint code_point, uint code_point_length) static Result success(CodePoint code_point, uint code_point_length)
{ {
return Result(Type.SUCCESS, code_point, code_point_length); return Result(SUCCESS, code_point, code_point_length);
}
bool is_success()
{
return type == Type.SUCCESS;
} }
static Result eof() static Result eof()
{ {
return Result(Type.EOF); return Result(EOF);
}
bool is_eof()
{
return type == Type.EOF;
} }
static Result decode_error() static Result decode_error()
{ {
return Result(Type.DECODE_ERROR); return Result(DECODE_ERROR);
}
bool is_decode_error()
{
return type == Type.DECODE_ERROR;
} }
} }
@ -499,36 +485,12 @@ class <%= @classname %>
for (;;) for (;;)
{ {
auto decoded = Decoder.decode_code_point(m_input[(m_input_position + attempt_match.length)..(m_input.length)]); auto decoded = Decoder.decode_code_point(m_input[(m_input_position + attempt_match.length)..(m_input.length)]);
if (decoded.is_decode_error()) switch (decoded)
{
return FindLongestMatchResult.decode_error();
}
bool lex_continue = false;
if (decoded.is_eof())
{
/* We hit EOF. */
if (longest_match.length > 0)
{
/* We have a match, so use it. */
return longest_match;
}
else if (attempt_match.length != 0)
{
/* There is a partial match - error! */
return FindLongestMatchResult.unexpected_input(attempt_match.length);
}
else
{
/* Valid EOF return. */
return FindLongestMatchResult.eof();
}
}
else
{ {
case Decoder.Result.SUCCESS:
auto transition_result = transition(current_state, decoded.code_point); auto transition_result = transition(current_state, decoded.code_point);
if (transition_result.found()) if (transition_result.found())
{ {
lex_continue = true;
attempt_match.length += decoded.code_point_length; attempt_match.length += decoded.code_point_length;
if (decoded.code_point == '\n') if (decoded.code_point == '\n')
{ {
@ -554,6 +516,32 @@ class <%= @classname %>
{ {
return FindLongestMatchResult.unexpected_input(attempt_match.length + decoded.code_point_length); return FindLongestMatchResult.unexpected_input(attempt_match.length + decoded.code_point_length);
} }
break;
case Decoder.Result.EOF:
/* We hit EOF. */
if (longest_match.length > 0)
{
/* We have a match, so use it. */
return longest_match;
}
else if (attempt_match.length != 0)
{
/* There is a partial match - error! */
return FindLongestMatchResult.unexpected_input(attempt_match.length);
}
else
{
/* Valid EOF return. */
return FindLongestMatchResult.eof();
}
break;
case Decoder.Result.DECODE_ERROR:
return FindLongestMatchResult.decode_error();
default:
assert(false);
} }
} }
} }