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

rename H_MAKE_TOKEN to H_MAKE and remove 'token' from other function names

Browse source
This commit is contained in:
Sven M. Hallberg 2013-01-23 18:28:50 +01:00
parent ef17e42ec8
commit 4c8b0086d7
5 changed files with 29 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

10
examples/dns.c
View file

@ -105,7 +105,7 @@ const HParsedToken* act_header(const HParseResult *p) {
dns_header_t *header = H_ALLOC(dns_header_t); dns_header_t *header = H_ALLOC(dns_header_t);
*header = header_; *header = header_;
return H_MAKE_TOKEN(dns_header_t, header); return H_MAKE(dns_header_t, header);
} }
const HParsedToken* act_label(const HParseResult *p) { const HParsedToken* act_label(const HParseResult *p) {
@ -117,7 +117,7 @@ const HParsedToken* act_label(const HParseResult *p) {
r->label[i] = p->ast->seq->elements[i]->uint; r->label[i] = p->ast->seq->elements[i]->uint;
r->label[r->len] = 0; r->label[r->len] = 0;
return H_MAKE_TOKEN(dns_label_t, r); return H_MAKE(dns_label_t, r);
} }
const HParsedToken* act_rr(const HParseResult *p) { const HParsedToken* act_rr(const HParseResult *p) {
@ -132,7 +132,7 @@ const HParsedToken* act_rr(const HParseResult *p) {
// Parse and pack RDATA. // Parse and pack RDATA.
set_rdata(*rr, p->ast->seq->elements[4]->seq); set_rdata(*rr, p->ast->seq->elements[4]->seq);
return H_MAKE_TOKEN(dns_rr_t, rr); return H_MAKE(dns_rr_t, rr);
} }
const HParsedToken* act_question(const HParseResult *p) { const HParsedToken* act_question(const HParseResult *p) {
@ -149,7 +149,7 @@ const HParsedToken* act_question(const HParseResult *p) {
q->qtype = fields[1]->uint; q->qtype = fields[1]->uint;
q->qclass = fields[2]->uint; q->qclass = fields[2]->uint;
return H_MAKE_TOKEN(dns_question_t, q); return H_MAKE(dns_question_t, q);
} }
const HParsedToken* act_message(const HParseResult *p) { const HParsedToken* act_message(const HParseResult *p) {
@ -194,7 +194,7 @@ const HParsedToken* act_message(const HParseResult *p) {
} }
msg->additional = additional; msg->additional = additional;
return H_MAKE_TOKEN(dns_message_t, msg); return H_MAKE(dns_message_t, msg);
} }
#define act_hdzero h_act_ignore #define act_hdzero h_act_ignore

2
examples/dns_common.c
View file

@ -50,7 +50,7 @@ const HParsedToken* act_domain(const HParseResult *p) {
if(arr) { if(arr) {
dns_domain_t *val = H_ALLOC(dns_domain_t); // dns_domain_t is char* dns_domain_t *val = H_ALLOC(dns_domain_t); // dns_domain_t is char*
*val = arr; *val = arr;
ret = H_MAKE_TOKEN(dns_domain_t, val); ret = H_MAKE(dns_domain_t, val);
} }
return ret; return ret;

20
examples/glue.c
View file

@ -48,16 +48,16 @@ void h_seq_append(HParsedToken *xs, const HParsedToken *ys)
// Flatten nested sequences. Always returns a sequence. // Flatten nested sequences. Always returns a sequence.
// If input element is not a sequence, returns it as a singleton sequence. // If input element is not a sequence, returns it as a singleton sequence.
const HParsedToken *h_token_flatten(HArena *arena, const HParsedToken *p) const HParsedToken *h_seq_flatten(HArena *arena, const HParsedToken *p)
{ {
assert(p != NULL); assert(p != NULL);
HParsedToken *ret = h_make_token_seq(arena); HParsedToken *ret = h_make_seq(arena);
switch(p->token_type) { switch(p->token_type) {
case TT_SEQUENCE: case TT_SEQUENCE:
// Flatten and append all. // Flatten and append all.
for(size_t i; i<p->seq->used; i++) { for(size_t i; i<p->seq->used; i++) {
h_seq_append(ret, h_token_flatten(arena, h_seq_index(p, i))); h_seq_append(ret, h_seq_flatten(arena, h_seq_index(p, i)));
} }
break; break;
default: default:
@ -69,26 +69,26 @@ const HParsedToken *h_token_flatten(HArena *arena, const HParsedToken *p)
return ret; return ret;
} }
// Action version of h_token_flatten. // Action version of h_seq_flatten.
const HParsedToken *h_act_flatten(const HParseResult *p) { const HParsedToken *h_act_flatten(const HParseResult *p) {
return h_token_flatten(p->arena, p->ast); return h_seq_flatten(p->arena, p->ast);
} }
HParsedToken *h_make_token_(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));
ret->token_type = type; ret->token_type = type;
return ret; return ret;
} }
HParsedToken *h_make_token_seq(HArena *arena) HParsedToken *h_make_seq(HArena *arena)
{ {
return h_make_token_(arena, TT_SEQUENCE); return h_make_(arena, TT_SEQUENCE);
} }
HParsedToken *h_make_token(HArena *arena, HTokenType type, void *value) HParsedToken *h_make(HArena *arena, HTokenType type, void *value)
{ {
HParsedToken *ret = h_make_token_(arena, type); HParsedToken *ret = h_make_(arena, type);
ret->user = value; ret->user = value;
return ret; return ret;
} }

10
examples/glue.h
View file

@ -45,19 +45,19 @@ const HParsedToken *h_act_flatten(const HParseResult *p);
// Token constructors... // Token constructors...
HParsedToken *h_make_token(HArena *arena, HTokenType type, void *value); HParsedToken *h_make(HArena *arena, HTokenType type, void *value);
HParsedToken *h_make_token_seq(HArena *arena); HParsedToken *h_make_seq(HArena *arena);
#define H_ALLOC(TYP) \ #define H_ALLOC(TYP) \
((TYP *) h_arena_malloc(p->arena, sizeof(TYP))) ((TYP *) h_arena_malloc(p->arena, sizeof(TYP)))
#define H_MAKE_TOKEN(TYP, VAL) \ #define H_MAKE(TYP, VAL) \
h_make_token(p->arena, TT_ ## TYP, VAL) h_make(p->arena, TT_ ## TYP, VAL)
// Sequences... // Sequences...
// Flatten nested sequences into one. // Flatten nested sequences into one.
const HParsedToken *h_token_flatten(HArena *arena, const HParsedToken *p); const HParsedToken *h_seq_flatten(HArena *arena, const HParsedToken *p);
void h_seq_snoc(HParsedToken *xs, const HParsedToken *x); void h_seq_snoc(HParsedToken *xs, const HParsedToken *x);
void h_seq_append(HParsedToken *xs, const HParsedToken *ys); void h_seq_append(HParsedToken *xs, const HParsedToken *ys);

16
examples/rr.c
View file

@ -25,7 +25,7 @@ const HParsedToken *act_null(const HParseResult *p) {
for (size_t i=0; i<len; ++i) for (size_t i=0; i<len; ++i)
buf[i] = p->ast->seq->elements[i]->uint; buf[i] = p->ast->seq->elements[i]->uint;
return H_MAKE_TOKEN(dns_rr_null_t, null); return H_MAKE(dns_rr_null_t, null);
} }
const HParsedToken *act_txt(const HParseResult *p) { const HParsedToken *act_txt(const HParseResult *p) {
@ -43,7 +43,7 @@ const HParsedToken *act_txt(const HParseResult *p) {
txt->count = p->ast->seq->elements[0]->seq->used; txt->count = p->ast->seq->elements[0]->seq->used;
txt->txt_data = ret; txt->txt_data = ret;
return H_MAKE_TOKEN(dns_rr_txt_t, txt); return H_MAKE(dns_rr_txt_t, txt);
} }
const HParsedToken* act_cstr(const HParseResult *p) { const HParsedToken* act_cstr(const HParseResult *p) {
@ -56,7 +56,7 @@ const HParsedToken* act_cstr(const HParseResult *p) {
assert(ret[arr->used-1] == '\0'); // XXX Is this right?! If so, shouldn't it be a validation? assert(ret[arr->used-1] == '\0'); // XXX Is this right?! If so, shouldn't it be a validation?
*cs = ret; *cs = ret;
return H_MAKE_TOKEN(dns_cstr_t, cs); return H_MAKE(dns_cstr_t, cs);
} }
const HParsedToken* act_soa(const HParseResult *p) { const HParsedToken* act_soa(const HParseResult *p) {
@ -70,7 +70,7 @@ const HParsedToken* act_soa(const HParseResult *p) {
soa->expire = p->ast->seq->elements[5]->uint; soa->expire = p->ast->seq->elements[5]->uint;
soa->minimum = p->ast->seq->elements[6]->uint; soa->minimum = p->ast->seq->elements[6]->uint;
return H_MAKE_TOKEN(dns_rr_soa_t, soa); return H_MAKE(dns_rr_soa_t, soa);
} }
const HParsedToken* act_wks(const HParseResult *p) { const HParsedToken* act_wks(const HParseResult *p) {
@ -83,7 +83,7 @@ const HParsedToken* act_wks(const HParseResult *p) {
for (size_t i=0; i<wks->len; ++i) for (size_t i=0; i<wks->len; ++i)
wks->bit_map[i] = p->ast->seq->elements[2]->seq->elements[i]->uint; wks->bit_map[i] = p->ast->seq->elements[2]->seq->elements[i]->uint;
return H_MAKE_TOKEN(dns_rr_wks_t, wks); return H_MAKE(dns_rr_wks_t, wks);
} }
const HParsedToken* act_hinfo(const HParseResult *p) { const HParsedToken* act_hinfo(const HParseResult *p) {
@ -92,7 +92,7 @@ const HParsedToken* act_hinfo(const HParseResult *p) {
hinfo->cpu = *H_FIELD(dns_cstr_t, 0); hinfo->cpu = *H_FIELD(dns_cstr_t, 0);
hinfo->os = *H_FIELD(dns_cstr_t, 1); hinfo->os = *H_FIELD(dns_cstr_t, 1);
return H_MAKE_TOKEN(dns_rr_hinfo_t, hinfo); return H_MAKE(dns_rr_hinfo_t, hinfo);
} }
const HParsedToken* act_minfo(const HParseResult *p) { const HParsedToken* act_minfo(const HParseResult *p) {
@ -101,7 +101,7 @@ const HParsedToken* act_minfo(const HParseResult *p) {
minfo->rmailbx = *H_FIELD(dns_domain_t, 0); minfo->rmailbx = *H_FIELD(dns_domain_t, 0);
minfo->emailbx = *H_FIELD(dns_domain_t, 1); minfo->emailbx = *H_FIELD(dns_domain_t, 1);
return H_MAKE_TOKEN(dns_rr_minfo_t, minfo); return H_MAKE(dns_rr_minfo_t, minfo);
} }
const HParsedToken* act_mx(const HParseResult *p) { const HParsedToken* act_mx(const HParseResult *p) {
@ -110,7 +110,7 @@ const HParsedToken* act_mx(const HParseResult *p) {
mx->preference = p->ast->seq->elements[0]->uint; mx->preference = p->ast->seq->elements[0]->uint;
mx->exchange = *H_FIELD(dns_domain_t, 1); mx->exchange = *H_FIELD(dns_domain_t, 1);
return H_MAKE_TOKEN(dns_rr_mx_t, mx); return H_MAKE(dns_rr_mx_t, mx);
} }