changes from tutorial: add h_literal, make h_make_bytes more practical

This commit is contained in:
Meredith L. Patterson 2015-05-04 19:00:37 -04:00
parent 33af1ec65c
commit 39c9096fd6
3 changed files with 6 additions and 4 deletions

View file

@ -106,11 +106,11 @@ HParsedToken *h_make_seqn(HArena *arena, size_t n)
return ret;
}
HParsedToken *h_make_bytes(HArena *arena, size_t len)
HParsedToken *h_make_bytes(HArena *arena, uint8_t *array, size_t len)
{
HParsedToken *ret = h_make_(arena, TT_BYTES);
ret->bytes.len = len;
ret->bytes.token = h_arena_malloc(arena, len);
ret->bytes.token = array;
return ret;
}

View file

@ -195,7 +195,7 @@ HParsedToken *h_act_ignore(const HParseResult *p, void* user_data);
HParsedToken *h_make(HArena *arena, HTokenType type, void *value);
HParsedToken *h_make_seq(HArena *arena); // Makes empty sequence.
HParsedToken *h_make_seqn(HArena *arena, size_t n); // Makes empty sequence of expected size n.
HParsedToken *h_make_bytes(HArena *arena, size_t len);
HParsedToken *h_make_bytes(HArena *arena, uint8_t *array, size_t len);
HParsedToken *h_make_sint(HArena *arena, int64_t val);
HParsedToken *h_make_uint(HArena *arena, uint64_t val);
@ -203,7 +203,7 @@ HParsedToken *h_make_uint(HArena *arena, uint64_t val);
#define H_MAKE(TYP, VAL) h_make(p->arena, (HTokenType)TT_ ## TYP, VAL)
#define H_MAKE_SEQ() h_make_seq(p->arena)
#define H_MAKE_SEQN(N) h_make_seqn(p->arena, N)
#define H_MAKE_BYTES(LEN) h_make_bytes(p->arena, LEN)
#define H_MAKE_BYTES(VAL, LEN) h_make_bytes(p->arena, VAL, LEN)
#define H_MAKE_SINT(VAL) h_make_sint(p->arena, VAL)
#define H_MAKE_UINT(VAL) h_make_uint(p->arena, VAL)

View file

@ -268,6 +268,8 @@ HAMMER_FN_DECL(HParseResult*, h_parse, const HParser* parser, const uint8_t* inp
*/
HAMMER_FN_DECL(HParser*, h_token, const uint8_t *str, const size_t len);
#define h_literal(s) h_token(s, sizeof(s)-1)
/**
* Given a single character, returns a parser that parses that
* character.