diff --git a/src/glue.c b/src/glue.c index cb3a7ce7de4dbc435da4ddefc4dfae956a3a063f..58fe4175d4fd326b62c76449449a74768605ca9e 100644 --- a/src/glue.c +++ b/src/glue.c @@ -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; } diff --git a/src/glue.h b/src/glue.h index 6c1c56ca0e368bc407d846f342dd52ba934c9dda..0bbfe9cfa26ec1bb6376ff23aa3b2d6cc3b4e873 100644 --- a/src/glue.h +++ b/src/glue.h @@ -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) diff --git a/src/hammer.h b/src/hammer.h index f893f10df4349d2ccc9d3a1c8c8675f60e014c9b..ce4eeca575c81f0dea7371f6155fb6f71d23dfd2 100644 --- a/src/hammer.h +++ b/src/hammer.h @@ -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.