Fixed signedness errors in two loops, got rid of unused variable in parse_choice

This commit is contained in:
Meredith L. Patterson 2012-05-01 03:57:37 +01:00
parent 530eed8df3
commit 37ff85eae8

View file

@ -216,7 +216,7 @@ typedef struct {
static parse_result_t* parse_sequence(void *env, parse_state_t *state) { static parse_result_t* parse_sequence(void *env, parse_state_t *state) {
sequence_t *s = (sequence_t*)env; sequence_t *s = (sequence_t*)env;
GSequence *seq = g_sequence_new(NULL); GSequence *seq = g_sequence_new(NULL);
for (int i=0; i<s->len; ++i) { for (size_t i=0; i<s->len; ++i) {
parse_result_t *tmp = do_parse(s->p_array[i], state); parse_result_t *tmp = do_parse(s->p_array[i], state);
g_sequence_append(seq, tmp); g_sequence_append(seq, tmp);
} }
@ -236,8 +236,7 @@ const parser_t* sequence(const parser_t* p_array[]) {
static parse_result_t* parse_choice(void *env, parse_state_t *state) { static parse_result_t* parse_choice(void *env, parse_state_t *state) {
sequence_t *s = (sequence_t*)env; sequence_t *s = (sequence_t*)env;
GSequence *seq = g_sequence_new(NULL); for (size_t i=0; i<s->len; ++i) {
for (int i=0; i<s->len; ++i) {
parse_result_t *tmp = do_parse(s->p_array[i], state); parse_result_t *tmp = do_parse(s->p_array[i], state);
if (NULL != tmp) if (NULL != tmp)
return tmp; return tmp;