emileclarkb/hammer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Parsers for sequence and choice are done. Got rid of join_action, we didn't need it. parse_result_t now contains a single parsed_token_t (and whatever we decide to jam into it later), so that sequence makes sense.

Browse source
This commit is contained in:
Meredith L. Patterson 2012-05-01 03:21:14 +01:00
parent f4d116d411
commit f7e7f92408
2 changed files with 80 additions and 89 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/hammer.h
View file

@ -54,13 +54,30 @@ typedef struct parse_state {
input_stream_t input_stream;
} parse_state_t;
typedef enum token_type {
TT_NONE,
TT_BYTES,
TT_SINT,
TT_UINT,
TT_SEQUENCE,
TT_MAX
} token_type_t;
typedef struct parsed_token {
const uint8_t *token;
size_t len;
token_type_t token_type;
union {
struct {
const uint8_t *token;
size_t len;
} bytes;
int64_t sint;
uint64_t uint;
GSequence *seq;
};
} parsed_token_t;
typedef struct parse_result {
const GSequence *ast;
const parsed_token_t *ast;
} parse_result_t;
typedef struct parser {
@ -85,9 +102,6 @@ const parser_t* whitespace(const parser_t* p);
/* Given another parser, p, and a function f, returns a parser that applies p, then applies f to everything in the AST of p's result. */
//const parser_t* action(const parser_t* p, /* fptr to action on AST */);
/* Given another parser, p, and a separator, sep, returns a parser that applies p, then joins everything in the AST of p's result with sep. For example, if the AST of p's result is {"dog", "cat", "hedgehog"} and sep is "|", the AST of this parser's result will be {"dog|cat|hedgehog"}. */
const parser_t* join_action(const parser_t* p, const uint8_t *sep, const size_t len);
const parser_t* left_factor_action(const parser_t* p);
/* Given a single-character parser, p, returns a single-character parser that will parse any character *other* than the character p would parse. */
@ -99,7 +113,7 @@ const parser_t* end_p();
/* This parser always fails. */
const parser_t* nothing_p();
/* Given an array of parsers, p_array, apply each parser in order. The parse succeeds only if all parsers succeed. */
const parser_t* sequence(const parser_t* p_array[]);
const parser_t* choice(const parser_t* p_array[]);
const parser_t* butnot(const parser_t* p1, const parser_t* p2);