rename: h_seq_index_user -> h_seq_index -> h_seq_index_token

This commit is contained in:
Sven M. Hallberg 2013-01-23 19:06:25 +01:00
parent 2d53a0f873
commit 2c90bd3ef5
2 changed files with 26 additions and 20 deletions

View file

@ -57,7 +57,7 @@ const HParsedToken *h_seq_flatten(HArena *arena, const HParsedToken *p)
case TT_SEQUENCE:
// Flatten and append all.
for(size_t i; i<p->seq->used; i++) {
h_seq_append(ret, h_seq_flatten(arena, h_seq_index(p, i)));
h_seq_append(ret, h_seq_flatten(arena, h_seq_index_token(p, i)));
}
break;
default:
@ -99,16 +99,16 @@ HParsedToken *h_carray_index(const HCountedArray *a, size_t i)
return a->elements[i];
}
HParsedToken *h_seq_index(const HParsedToken *p, size_t i)
HParsedToken *h_seq_index_token(const HParsedToken *p, size_t i)
{
assert(p != NULL);
assert(p->token_type == TT_SEQUENCE);
return h_carray_index(p->seq, i);
}
void *h_seq_index_user(HTokenType type, const HParsedToken *p, size_t i)
void *h_seq_index(HTokenType type, const HParsedToken *p, size_t i)
{
HParsedToken *elem = h_seq_index(p, i);
HParsedToken *elem = h_seq_index_token(p, i);
assert(elem->token_type == (HTokenType)type);
return elem->user;
}