kc3-lang/kc3

Browse

Commit a72078d0440bef0d441f4b6e852f4bf2f061ef96

Thomas de Grivel 2024-03-22T19:07:40

fix printing of special operators 

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

diff --git a/libc3/buf_inspect.c b/libc3/buf_inspect.c
index 92173e9..2467b4b 100644
--- a/libc3/buf_inspect.c
+++ b/libc3/buf_inspect.c
@@ -350,24 +350,27 @@ sw buf_inspect_bool_size (const bool *b)
 
 sw buf_inspect_call (s_buf *buf, const s_call *call)
 {
+  bool op;
+  u8 op_arity;
   s8 op_precedence;
   sw r;
   sw result = 0;
   if (call->ident.module == &g_sym_C3 &&
       call->ident.sym == &g_sym_if_then_else)
     return buf_inspect_call_if_then_else(buf, call);
-  if (operator_find(&call->ident) &&
-      operator_symbol(&call->ident) == &g_sym__brackets)
+  op = operator_find(&call->ident);
+  if (op && operator_symbol(&call->ident) == &g_sym__brackets)
     return buf_inspect_call_brackets(buf, call);
   if (call->ident.sym == &g_sym_cast)
     return buf_inspect_cast(buf, call);
-  if (operator_find(&call->ident) &&
-      operator_arity(&call->ident) == 1)
+  op_arity = op ? operator_arity(&call->ident) : 0;
+  if (op && op_arity == 1)
     return buf_inspect_call_op_unary(buf, call);
-  if (operator_find(&call->ident) &&
-      operator_arity(&call->ident) == 2 &&
+  if (op && op_arity == 2 &&
       (op_precedence = operator_precedence(&call->ident)) > 0)
     return buf_inspect_call_op(buf, call, op_precedence);
+  if (ident_is_special_operator(&call->ident))
+    return buf_inspect_call_special_operator(buf, call);
   if ((r = buf_inspect_ident(buf, &call->ident)) < 0)
     return r;
   result += r;
@@ -627,19 +630,23 @@ sw buf_inspect_call_paren (s_buf *buf, const s_call *call)
 
 sw buf_inspect_call_size (const s_call *call)
 {
+  bool op;
+  u8 op_arity;
   s8 op_precedence;
   sw r;
   sw result = 0;
   if (call->ident.module == &g_sym_C3 &&
       call->ident.sym == &g_sym_if_then_else)
     return buf_inspect_call_if_then_else_size(call);
-  if (operator_find(&call->ident) &&
-      operator_arity(&call->ident) == 1)
+  op = operator_find(&call->ident);
+  op_arity = operator_arity(&call->ident);
+  if (op && op_arity == 1)
     return buf_inspect_call_op_unary_size(call);
-  if (operator_find(&call->ident) &&
-      operator_arity(&call->ident) == 2 &&
+  if (op && op_arity == 2 &&
       (op_precedence = operator_precedence(&call->ident)) > 0)
     return buf_inspect_call_op_size(call, op_precedence);
+  if (ident_is_special_operator(&call->ident))
+    return buf_inspect_call_special_operator_size(call);
   if ((r = buf_inspect_ident_size(&call->ident)) < 0)
     return r;
   result += r;
@@ -649,6 +656,52 @@ sw buf_inspect_call_size (const s_call *call)
   return result;
 }
 
+sw buf_inspect_call_special_operator (s_buf *buf, const s_call *call)
+{
+  const s_list *args;
+  sw r;
+  sw result = 0;
+  assert(ident_is_special_operator(&call->ident));
+  assert(special_operator_arity(&call->ident) ==
+         list_length(call->arguments));
+  args = call->arguments;
+  if ((r = buf_inspect_ident(buf, &call->ident)) < 0)
+    return r;
+  result += r;
+  while (args) {
+    if ((r = buf_write_1(buf, " ")) < 0)
+      return r;
+    result += r;
+    if ((r = buf_inspect_tag(buf, &args->tag)) < 0)
+      return r;
+    result += r;
+    args = list_next(args);
+  }
+  return result;
+}
+
+sw buf_inspect_call_special_operator_size (const s_call *call)
+{
+  const s_list *args;
+  sw r;
+  sw result = 0;
+  assert(ident_is_special_operator(&call->ident));
+  assert(special_operator_arity(&call->ident) ==
+         list_length(call->arguments));
+  args = call->arguments;
+  if ((r = buf_inspect_ident_size(&call->ident)) < 0)
+    return r;
+  result += r;
+  while (args) {
+    result += strlen(" ");
+    if ((r = buf_inspect_tag_size(&args->tag)) < 0)
+      return r;
+    result += r;
+    args = list_next(args);
+  }
+  return result;
+}
+
 sw buf_inspect_cast (s_buf *buf, const s_call *call)
 {
   s_tag *arg;
diff --git a/libc3/buf_inspect.h b/libc3/buf_inspect.h
index d8d7dab..bdb2118 100644
--- a/libc3/buf_inspect.h
+++ b/libc3/buf_inspect.h
@@ -74,6 +74,8 @@ 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_call_special_operator (s_buf *buf, const s_call *call);
+sw buf_inspect_call_special_operator_size (const s_call *call);
 sw buf_inspect_cast (s_buf *buf, const s_call *call);
 sw buf_inspect_cast_size (const s_call *call);
 sw buf_inspect_cfn (s_buf *buf, const s_cfn *cfn);
kmx.io     mail     discord kmxgit v0.4.0