diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/build.c | 2 | ||||
| -rw-r--r-- | src/parse.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/build.c b/src/build.c index 4c26e69..50b565b 100644 --- a/src/build.c +++ b/src/build.c @@ -26,12 +26,12 @@ static void rec_write_bblc(struct tree *tree, FILE *file, char *byte, int *bit) switch (tree->type) { case ABS: write_bit(0, file, byte, bit); + write_bit(1, file, byte, bit); write_bit(0, file, byte, bit); rec_write_bblc(tree->u.abs.term, file, byte, bit); break; case APP: write_bit(0, file, byte, bit); - write_bit(1, file, byte, bit); write_bit(0, file, byte, bit); rec_write_bblc(tree->u.app.lhs, file, byte, bit); rec_write_bblc(tree->u.app.rhs, file, byte, bit); diff --git a/src/parse.c b/src/parse.c index 5f00ffa..7051dd8 100644 --- a/src/parse.c +++ b/src/parse.c @@ -46,19 +46,19 @@ struct term *parse_blc(const char *term) #define BIT_AT(i) ((term[(i) / 8] & (1 << (7 - ((i) % 8)))) >> (7 - ((i) % 8))) // parses bloc's bit-encoded blc -// 00M -> abstraction of M -// 010MN -> application of M and N +// 010M -> abstraction of M +// 00MN -> application of M and N // 1X0 -> bruijn index, amount of 1s in X // 011I -> 2B index to entry static struct term *parse_bloc_bblc(const char *term, size_t *bit) { struct term *res = 0; - if (!BIT_AT(*bit) && !BIT_AT(*bit + 1)) { - (*bit) += 2; + if (!BIT_AT(*bit) && BIT_AT(*bit + 1) && !BIT_AT(*bit + 2)) { + (*bit) += 3; res = new_term(ABS); res->u.abs.term = parse_bloc_bblc(term, bit); - } else if (!BIT_AT(*bit) && BIT_AT(*bit + 1) && !BIT_AT(*bit + 2)) { - (*bit) += 3; + } else if (!BIT_AT(*bit) && !BIT_AT(*bit + 1)) { + (*bit) += 2; res = new_term(APP); res->u.app.lhs = parse_bloc_bblc(term, bit); res->u.app.rhs = parse_bloc_bblc(term, bit); |