buf_parse_tag_tuple added to buf_parse_tag
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42
diff --git a/libkc3/buf_parse.c b/libkc3/buf_parse.c
index f9f526c..7653114 100644
--- a/libkc3/buf_parse.c
+++ b/libkc3/buf_parse.c
@@ -437,11 +437,8 @@ sw buf_parse_block (s_buf *buf, s_block *block)
assert(! "buf_parse_block: buf_parse_block_inner < 0");
goto restore;
}
- if (! r) {
- err_puts("buf_parse_block: buf_parse_block_inner = 0");
- assert(! "buf_parse_block: buf_parse_block_inner = 0");
+ if (! r)
goto restore;
- }
result += r;
r = result;
goto clean;
@@ -3682,6 +3679,7 @@ sw buf_parse_tag (s_buf *buf, s_tag *dest)
if ((r = buf_parse_tag_special_operator(buf, dest)) != 0 ||
(r = buf_parse_tag_brackets(buf, dest)) != 0 ||
(r = buf_parse_tag_call_op(buf, dest)) != 0 ||
+ (r = buf_parse_tag_tuple(buf, dest)) != 0 ||
(r = buf_parse_tag_block(buf, dest)) != 0 ||
(r = buf_parse_tag_primary(buf, dest)) != 0)
goto end;
diff --git a/test/ikc3/current_test b/test/ikc3/current_test
index e88e79e..d25d5eb 100644
--- a/test/ikc3/current_test
+++ b/test/ikc3/current_test
@@ -1 +1 @@
-globals
+tuple
diff --git a/test/ikc3/str.out.expected b/test/ikc3/str.out.expected
index 505e5f3..573d118 100644
--- a/test/ikc3/str.out.expected
+++ b/test/ikc3/str.out.expected
@@ -50,4 +50,4 @@
"#{%Buf{}}"
"%Buf{column: (Sw) 0, flush: (Ptr) 0x0, free: false, line: (Sw) 0, ptr: (Ptr) 0x0, refill: (Ptr) 0x0, rpos: (Uw) 0, save: (Ptr) 0x0, seek: (Ptr) 0x0, size: (Uw) 0, user_ptr: (Ptr) 0x0, wpos: (Uw) 0}"
"#{%BufRW{}}"
-"%BufRW{r: %Buf{column: (Sw) 0, flush: (Ptr) 0x0, free: false, line: (Sw) 0, ptr: (Ptr) 0x0, refill: (Ptr) 0x0, rpos: (Uw) 0, save: (Ptr) 0x0, seek: (Ptr) 0x0, size: (Uw) 0, user_ptr: (Ptr) 0x0, wpos: (Uw) 0}, w: %Buf{column: (Sw) 0, flush: (Ptr) 0x0, free: false, line: (Sw) 0, ptr: (Ptr) 0x0, refill: (Ptr) 0x0, rpos: (Uw) 0, save: (Ptr) 0x0, seek: (Ptr) 0x0, size: (Uw) 0, user_ptr: (Ptr) 0x0, wpos: (Uw) 0}}"
+"%BufRW{r: (Ptr) 0x0, w: (Ptr) 0x0}"