From 866e66ccf9538e3c19d03739e8c804ab2fc4029e Mon Sep 17 00:00:00 2001 From: "Sven M. Hallberg" Date: Sun, 17 Feb 2013 16:29:54 +0100 Subject: [PATCH 1/2] fix counter init in h_seq_append --- src/glue.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glue.c b/src/glue.c index 7f9c6fa..2735e48 100644 --- a/src/glue.c +++ b/src/glue.c @@ -142,7 +142,7 @@ void h_seq_append(HParsedToken *xs, const HParsedToken *ys) assert(ys != NULL); assert(ys->token_type == TT_SEQUENCE); - for(size_t i; iseq->used; i++) + for(size_t i=0; iseq->used; i++) h_carray_append(xs->seq, ys->seq->elements[i]); } From 0cfec9781ab7dfa0718b04bd5a34fd3d2eb72394 Mon Sep 17 00:00:00 2001 From: "Sven M. Hallberg" Date: Sun, 17 Feb 2013 16:47:36 +0100 Subject: [PATCH 2/2] add glue helper to construct sized sequences --- src/glue.c | 7 +++++++ src/glue.h | 2 ++ 2 files changed, 9 insertions(+) diff --git a/src/glue.c b/src/glue.c index 2735e48..f1e086a 100644 --- a/src/glue.c +++ b/src/glue.c @@ -55,6 +55,13 @@ HParsedToken *h_make_seq(HArena *arena) return ret; } +HParsedToken *h_make_seqn(HArena *arena, size_t n) +{ + HParsedToken *ret = h_make_(arena, TT_SEQUENCE); + ret->seq = h_carray_new_sized(arena, n); + return ret; +} + HParsedToken *h_make_bytes(HArena *arena, size_t len) { HParsedToken *ret = h_make_(arena, TT_BYTES); diff --git a/src/glue.h b/src/glue.h index 90944ea..3125ae0 100644 --- a/src/glue.h +++ b/src/glue.h @@ -173,6 +173,7 @@ const HParsedToken *h_act_flatten(const HParseResult *p); 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_sint(HArena *arena, int64_t val); HParsedToken *h_make_uint(HArena *arena, uint64_t val); @@ -180,6 +181,7 @@ HParsedToken *h_make_uint(HArena *arena, uint64_t val); // Standard short-hands to make tokens in an action. #define H_MAKE(TYP, VAL) h_make(p->arena, 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_SINT(VAL) h_make_sint(p->arena, VAL) #define H_MAKE_UINT(VAL) h_make_uint(p->arena, VAL)