Merge branch 'master' of 10.24.0.1:Projects/hammer. Also, licenses for everything!

Conflicts:
	src/hammer.c
This commit is contained in:
Meredith L. Patterson 2012-05-12 22:26:59 +01:00
commit 0164ddc98d
9 changed files with 153 additions and 30 deletions

View file

@ -57,6 +57,7 @@ typedef enum token_type {
TT_SINT,
TT_UINT,
TT_SEQUENCE,
TT_ERR,
TT_MAX
} token_type_t;
@ -80,6 +81,7 @@ typedef struct parsed_token {
*/
typedef struct parse_result {
const parsed_token_t *ast;
arena_t arena;
} parse_result_t;
/* Type of an action to apply to an AST, used in the action() parser. */