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

Merge pull request #125 from pesco/fix-h_seq_index_path

Browse source 
Descend properly in h_seq_index_path
This commit is contained in:
Meredith L. Patterson 2015-01-30 21:37:34 +01:00
commit 8aba9ce217
3 changed files with 24 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/glue.c
View file

@ -173,7 +173,7 @@ HParsedToken *h_seq_index_vpath(const HParsedToken *p, size_t i, va_list va)
int j; int j;
while((j = va_arg(va, int)) >= 0) while((j = va_arg(va, int)) >= 0)
ret = h_seq_index(p, j); ret = h_seq_index(ret, j);
return ret; return ret;
} }

22
src/t_regression.c
View file

@ -3,6 +3,7 @@
#include "glue.h" #include "glue.h"
#include "hammer.h" #include "hammer.h"
#include "test_suite.h" #include "test_suite.h"
#include "internal.h"
static void test_bug118(void) { static void test_bug118(void) {
// https://github.com/UpstandingHackers/hammer/issues/118 // https://github.com/UpstandingHackers/hammer/issues/118
@ -33,6 +34,27 @@ static void test_bug118(void) {
h_parse_result_free(p); h_parse_result_free(p);
} }
static void test_seq_index_path(void) {
HArena *arena = h_new_arena(&system_allocator, 0);
HParsedToken *seq = h_make_seqn(arena, 1);
HParsedToken *seq2 = h_make_seqn(arena, 2);
HParsedToken *tok1 = h_make_uint(arena, 41);
HParsedToken *tok2 = h_make_uint(arena, 42);
seq->seq->elements[0] = seq2;
seq->seq->used = 1;
seq2->seq->elements[0] = tok1;
seq2->seq->elements[1] = tok2;
seq2->seq->used = 2;
g_check_cmp_int(h_seq_index_path(seq, 0, -1)->token_type, ==, TT_SEQUENCE);
g_check_cmp_int(h_seq_index_path(seq, 0, 0, -1)->token_type, ==, TT_UINT);
g_check_cmp_int64(h_seq_index_path(seq, 0, 0, -1)->uint, ==, 41);
g_check_cmp_int64(h_seq_index_path(seq, 0, 1, -1)->uint, ==, 42);
}
void register_regression_tests(void) { void register_regression_tests(void) {
g_test_add_func("/core/regression/bug118", test_bug118); g_test_add_func("/core/regression/bug118", test_bug118);
g_test_add_func("/core/regression/seq_index_path", test_seq_index_path);
} }

1
src/test_suite.h
View file

@ -212,6 +212,7 @@
#define g_check_cmp_int(n1, op, n2) g_check_inttype("%d", int, n1, op, n2)
#define g_check_cmp_int32(n1, op, n2) g_check_inttype("%d", int32_t, n1, op, n2) #define g_check_cmp_int32(n1, op, n2) g_check_inttype("%d", int32_t, n1, op, n2)
#define g_check_cmp_int64(n1, op, n2) g_check_inttype("%" PRId64, int64_t, n1, op, n2) #define g_check_cmp_int64(n1, op, n2) g_check_inttype("%" PRId64, int64_t, n1, op, n2)
#define g_check_cmp_uint32(n1, op, n2) g_check_inttype("%u", uint32_t, n1, op, n2) #define g_check_cmp_uint32(n1, op, n2) g_check_inttype("%u", uint32_t, n1, op, n2)