Commit 6147895da44066fe53f07f2f6a88ced6533cc62f
2023-03-18T09:00:06
test
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 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72
diff --git a/libc3/buf_parse.c b/libc3/buf_parse.c
index fdab149..5013773 100644
--- a/libc3/buf_parse.c
+++ b/libc3/buf_parse.c
@@ -262,10 +262,10 @@ sw buf_parse_call_op_rec (s_buf *buf, s_call *dest, u8 min_precedence)
call_clean(&tmp2);
break;
}
+ result += r;
bzero(right, sizeof(s_tag));
right->type.type = TAG_CALL;
right->data.call = tmp2;
- result += r;
if ((r = buf_ignore_spaces(buf)) < 0)
break;
result += r;
diff --git a/test/buf_parse_test.c b/test/buf_parse_test.c
index 07a8d3e..a92ec5a 100644
--- a/test/buf_parse_test.c
+++ b/test/buf_parse_test.c
@@ -51,6 +51,19 @@
test_context(NULL); \
} while (0)
+#define BUF_PARSE_TEST_CALL_OP(test) \
+ do { \
+ s_buf buf; \
+ s_call dest; \
+ test_context("buf_parse_call_op(" # test ")"); \
+ buf_init_1(&buf, (test)); \
+ bzero(&dest, sizeof(s_call)); \
+ TEST_EQ(buf_parse_call_op(&buf, &dest), strlen(test)); \
+ call_clean(&dest); \
+ buf_clean(&buf); \
+ test_context(NULL); \
+ } while (0)
+
#define BUF_PARSE_TEST_CFN(test) \
do { \
s_buf buf; \
@@ -614,6 +627,7 @@
void buf_parse_test_bool ();
void buf_parse_test_call ();
+void buf_parse_test_call_op ();
void buf_parse_test_cfn ();
void buf_parse_test_character ();
void buf_parse_test_digit_bin ();
@@ -641,6 +655,7 @@ void buf_parse_test ()
{
buf_parse_test_bool();
buf_parse_test_call();
+ buf_parse_test_call_op();
buf_parse_test_digit_bin();
buf_parse_test_digit_hex();
buf_parse_test_digit_oct();
@@ -710,6 +725,15 @@ void buf_parse_test_call ()
BUF_PARSE_TEST_CALL("a(B.c(D.e(f, g), H.i(j, k)))");
}
+void buf_parse_test_call_op ()
+{
+ BUF_PARSE_TEST_CALL_OP("1 + 2");
+ BUF_PARSE_TEST_CALL_OP("1 + 2 + 3");
+ BUF_PARSE_TEST_CALL_OP("1 + 2 / 3");
+ BUF_PARSE_TEST_CALL_OP("1 + 2 / 3 * 4");
+ BUF_PARSE_TEST_CALL_OP("1 + 2 / 3 * 4 - 5");
+}
+
void buf_parse_test_cfn ()
{
BUF_PARSE_TEST_NOT_CFN("0");