Commit dbf295a562fdaa0bc2b3cbcdf4eae57a5624e6a5
2023-08-05T12:39:07
buf_inspect_call_paren
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 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138
diff --git a/libc3/buf_inspect.c b/libc3/buf_inspect.c
index f38a9fc..86a9e69 100644
--- a/libc3/buf_inspect.c
+++ b/libc3/buf_inspect.c
@@ -247,6 +247,46 @@ sw buf_inspect_call (s_buf *buf, const s_call *call)
return result;
}
+sw buf_inspect_call_args (s_buf *buf, const s_list *args)
+{
+ sw r;
+ sw result = 0;
+ if ((r = buf_write_1(buf, "(")) < 0)
+ return r;
+ result += r;
+ while (args) {
+ if ((r = buf_inspect_tag(buf, &args->tag)) < 0)
+ return r;
+ result += r;
+ if ((args = list_next(args))) {
+ if ((r = buf_write_1(buf, ", ")) < 0)
+ return r;
+ result += r;
+ }
+ }
+ if ((r = buf_write_1(buf, ")")) < 0)
+ return r;
+ result += r;
+ return result;
+}
+
+sw buf_inspect_call_args_size (const s_list *args)
+{
+ sw r;
+ sw result = 0;
+ result += strlen("(");
+ while (args) {
+ if ((r = buf_inspect_tag_size(&args->tag)) < 0)
+ return r;
+ result += r;
+ if ((args = list_next(args))) {
+ result += strlen(", ");
+ }
+ }
+ result += strlen(")");
+ return result;
+}
+
sw buf_inspect_call_op (s_buf *buf, const s_call *call, s8 op_precedence)
{
s_tag *left;
@@ -307,48 +347,43 @@ sw buf_inspect_call_op (s_buf *buf, const s_call *call, s8 op_precedence)
sw buf_inspect_call_op_unary (s_buf *buf, const s_call *call)
{
- (void) buf;
- (void) call;
- return 0;
-}
-
-sw buf_inspect_call_args (s_buf *buf, const s_list *args)
-{
sw r;
sw result = 0;
- if ((r = buf_write_1(buf, "(")) < 0)
+ if (call->ident.sym == sym_1("()"))
+ return buf_inspect_call_paren(buf, call);
+ if ((r = buf_inspect_ident(buf, &call->ident)) < 0)
return r;
result += r;
- while (args) {
- if ((r = buf_inspect_tag(buf, &args->tag)) < 0)
- return r;
- result += r;
- if ((args = list_next(args))) {
- if ((r = buf_write_1(buf, ", ")) < 0)
- return r;
- result += r;
- }
- }
- if ((r = buf_write_1(buf, ")")) < 0)
+ if ((r = buf_write_1(buf, " ")) < 0)
+ return r;
+ result += r;
+ if ((r = buf_inspect_tag(buf, &call->arguments->tag)) < 0)
return r;
result += r;
return result;
}
-sw buf_inspect_call_args_size (const s_list *args)
+sw buf_inspect_call_op_unary_size (const s_call *call)
+{
+ (void) call;
+ return -1;
+}
+
+sw buf_inspect_call_paren (s_buf *buf, const s_call *call)
{
sw r;
sw result = 0;
- result += strlen("(");
- while (args) {
- if ((r = buf_inspect_tag_size(&args->tag)) < 0)
- return r;
- result += r;
- if ((args = list_next(args))) {
- result += strlen(", ");
- }
- }
- result += strlen(")");
+ assert(buf);
+ assert(call);
+ if ((r = buf_write_1(buf, "(")) < 0)
+ return r;
+ result += r;
+ if ((r = buf_inspect_tag(buf, &call->arguments->tag)) < 0)
+ return r;
+ result += r;
+ if ((r = buf_write_1(buf, ")")) < 0)
+ return r;
+ result += r;
return result;
}
diff --git a/libc3/buf_inspect.h b/libc3/buf_inspect.h
index 19f3feb..5252961 100644
--- a/libc3/buf_inspect.h
+++ b/libc3/buf_inspect.h
@@ -60,6 +60,8 @@ sw buf_inspect_call_op (s_buf *buf, const s_call *call,
sw buf_inspect_call_op_size (const s_call *call, s8 op_precedence);
sw buf_inspect_call_op_unary (s_buf *buf, const s_call *call);
sw buf_inspect_call_op_unary_size (const s_call *call);
+sw buf_inspect_call_paren (s_buf *buf, const s_call *call);
+sw buf_inspect_call_paren_size (const s_call *call);
sw buf_inspect_call_size (const s_call *call);
sw buf_inspect_cfn (s_buf *buf, const s_cfn *cfn);
sw buf_inspect_cfn_size (const s_cfn *cfn);