msyds/gf-core
1
0
Fork 0
forked from GitHub/gf-core
Code Pull Requests Activity

libpgf: the choice object should remember integers instead of single bytes

Browse Source
This commit is contained in:
kr.angelov
2012-02-29 13:41:59 +00:00
parent aae0ddc22a
commit 65a69cab91
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/runtime/c/gu/choice.c
View File

@@ -12,7 +12,7 @@ GuChoice*
gu_new_choice(GuPool* pool) gu_new_choice(GuPool* pool)
{ {
GuChoice* ch = gu_new(GuChoice, pool); GuChoice* ch = gu_new(GuChoice, pool);
ch->path = gu_new_buf(uint8_t, pool); ch->path = gu_new_buf(size_t, pool);
ch->path_idx = 0; ch->path_idx = 0;
return ch; return ch;
} }
@@ -38,17 +38,16 @@ int
gu_choice_next(GuChoice* ch, int n_choices) gu_choice_next(GuChoice* ch, int n_choices)
{ {
gu_assert(n_choices >= 0); gu_assert(n_choices >= 0);
gu_require(n_choices <= UINT8_MAX);
gu_assert(ch->path_idx <= gu_buf_length(ch->path)); gu_assert(ch->path_idx <= gu_buf_length(ch->path));
if (n_choices == 0) { if (n_choices == 0) {
return -1; return -1;
} }
int i = 0; int i = 0;
if (gu_buf_length(ch->path) > ch->path_idx) { if (gu_buf_length(ch->path) > ch->path_idx) {
i = (int) gu_buf_get(ch->path, uint8_t, ch->path_idx); i = (int) gu_buf_get(ch->path, size_t, ch->path_idx);
gu_assert(i <= n_choices); gu_assert(i <= n_choices);
} else { } else {
gu_buf_push(ch->path, uint8_t, n_choices); gu_buf_push(ch->path, size_t, n_choices);
i = n_choices; i = n_choices;
} }
int ret = (i == 0) ? -1 : n_choices - i; int ret = (i == 0) ? -1 : n_choices - i;
@@ -63,9 +62,9 @@ gu_choice_advance(GuChoice* ch)
gu_assert(ch->path_idx <= gu_buf_length(ch->path)); gu_assert(ch->path_idx <= gu_buf_length(ch->path));
while (gu_buf_length(ch->path) > ch->path_idx) { while (gu_buf_length(ch->path) > ch->path_idx) {
uint8_t last = gu_buf_pop(ch->path, uint8_t); size_t last = gu_buf_pop(ch->path, size_t);
if (last > 1) { if (last > 1) {
gu_buf_push(ch->path, uint8_t, last-1); gu_buf_push(ch->path, size_t, last-1);
return true; return true;
} }
} }