emileclarkb/hammer
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

expand h_make family to include seq, bytes, sint, and uint tokens

Browse source
This commit is contained in:
Sven M. Hallberg 2013-01-23 19:29:29 +01:00
parent 54046e25da
commit 71cdd46ceb
2 changed files with 37 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

31
examples/glue.c
View file

@ -74,6 +74,7 @@ const HParsedToken *h_act_flatten(const HParseResult *p) {
return h_seq_flatten(p->arena, p->ast); return h_seq_flatten(p->arena, p->ast);
} }
// Low-level helper for the h_make family.
HParsedToken *h_make_(HArena *arena, HTokenType type) HParsedToken *h_make_(HArena *arena, HTokenType type)
{ {
HParsedToken *ret = h_arena_malloc(arena, sizeof(HParsedToken)); HParsedToken *ret = h_arena_malloc(arena, sizeof(HParsedToken));
@ -81,6 +82,14 @@ HParsedToken *h_make_(HArena *arena, HTokenType type)
return ret; return ret;
} }
HParsedToken *h_make(HArena *arena, HTokenType type, void *value)
{
assert(type >= TT_USER);
HParsedToken *ret = h_make_(arena, type);
ret->user = value;
return ret;
}
HParsedToken *h_make_seq(HArena *arena) HParsedToken *h_make_seq(HArena *arena)
{ {
HParsedToken *ret = h_make_(arena, TT_SEQUENCE); HParsedToken *ret = h_make_(arena, TT_SEQUENCE);
@ -88,13 +97,29 @@ HParsedToken *h_make_seq(HArena *arena)
return ret; return ret;
} }
HParsedToken *h_make(HArena *arena, HTokenType type, void *value) HParsedToken *h_make_bytes(HArena *arena, size_t len)
{ {
HParsedToken *ret = h_make_(arena, type); HParsedToken *ret = h_make_(arena, TT_BYTES);
ret->user = value; ret->bytes.len = len;
ret->bytes.token = h_arena_malloc(arena, len);
return ret; return ret;
} }
HParsedToken *h_make_sint(HArena *arena, int64_t val)
{
HParsedToken *ret = h_make_(arena, TT_SINT);
ret->sint = val;
return ret;
}
HParsedToken *h_make_uint(HArena *arena, uint64_t val)
{
HParsedToken *ret = h_make_(arena, TT_UINT);
ret->uint = val;
return ret;
}
// XXX -> internal
HParsedToken *h_carray_index(const HCountedArray *a, size_t i) HParsedToken *h_carray_index(const HCountedArray *a, size_t i)
{ {
assert(i < a->used); assert(i < a->used);

9
examples/glue.h
View file

@ -51,9 +51,16 @@ const HParsedToken *h_act_flatten(const HParseResult *p);
HParsedToken *h_make(HArena *arena, HTokenType type, void *value); HParsedToken *h_make(HArena *arena, HTokenType type, void *value);
HParsedToken *h_make_seq(HArena *arena); // Makes empty sequence. HParsedToken *h_make_seq(HArena *arena); // Makes empty sequence.
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);
// Standard short-hand to make a user-type token. // Standard short-hands to make tokens in an action.
#define H_MAKE(TYP, VAL) h_make(p->arena, TT_ ## TYP, VAL) #define H_MAKE(TYP, VAL) h_make(p->arena, TT_ ## TYP, VAL)
#define H_MAKE_SEQ() h_make_seq(p->arena)
#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)
// Sequence access... // Sequence access...