From 39c9096fd61507dda19626d0838e851ded1f081a Mon Sep 17 00:00:00 2001
From: "Meredith L. Patterson" <mlp@thesmartpolitenerd.com>
Date: Mon, 4 May 2015 19:00:37 -0400
Subject: [PATCH] changes from tutorial: add h_literal, make h_make_bytes more
practical
---
src/glue.c | 4 ++--
src/glue.h | 4 ++--
src/hammer.h | 2 ++
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/glue.c b/src/glue.c
index cb3a7ce7..58fe4175 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 6c1c56ca..0bbfe9cf 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 f893f10d..ce4eeca5 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.
--
GitLab