Commit 374cde615134924480af18cd2c51a531f5100ba9
2023-11-17T12:47:58
wip buf_parse_map
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 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168
diff --git a/libc3/buf_parse.c b/libc3/buf_parse.c
index 06d7362..fc68b0a 100644
--- a/libc3/buf_parse.c
+++ b/libc3/buf_parse.c
@@ -1931,41 +1931,48 @@ sw buf_parse_map (s_buf *buf, s_map *dest)
sw buf_parse_map_key (s_buf *buf, s_tag *dest)
{
sw r;
+ if ((r = buf_parse_map_key_str(buf, dest)) ||
+ (r = buf_parse_map_key_sym(buf, dest)) ||
+ (r = buf_parse_map_key_tag(buf, dest)))
+ return r;
+ return 0;
+}
+
+sw buf_parse_map_key_str (s_buf *buf, s_tag *dest)
+{
+ sw r;
sw result = 0;
s_buf_save save;
s_str str;
- s_tag tag;
+ assert(buf);
+ assert(dest);
buf_save_init(buf, &save);
- if ((r = buf_parse_map_key_str(buf, &tag)) ||
- (r = buf_parse_map_key_sym(buf, &tag)) ||
- (r = buf_parse_map_key_tag(buf, &tag)))
-
- if ((r = buf_parse_sym_str(buf, &str)) < 0)
+ if ((r = buf_parse_str(buf, &str)) < 0)
goto clean;
if (r > 0) {
result += r;
- if ((r = buf_read_1(buf, ":")) <= 0)
- buf_save_restore_rpos(buf, &save);
- else {
+ if ((r = buf_read_1(buf, ":")) < 0)
+ goto restore;
+ if (r > 0) {
result += r;
dest->type = TAG_SYM;
dest->data.sym = str_to_sym(&str);
str_clean(&str);
goto ok;
}
+ if ((r = buf_parse_comments(buf)) < 0)
+ goto restore;
+ result += r;
+ if ((r = buf_ignore_spaces(buf)) <= 0)
+ goto restore;
+ result += r;
+ if ((r = buf_read_1(buf, "=>")) <= 0)
+ goto restore;
+ result += r;
+ dest->type = TAG_STR;
+ dest->data.str = str;
+ goto ok;
}
- if ((r = buf_parse_tag(buf, &tag)) <= 0)
- goto restore;
- if ((r = buf_parse_comments(buf)) < 0)
- goto restore;
- result += r;
- if ((r = buf_ignore_spaces(buf)) <= 0)
- goto restore;
- result += r;
- if ((r = buf_read_1(buf, "=>")) <= 0)
- goto restore;
- result += r;
- *dest = tag;
ok:
r = result;
goto clean;
@@ -1976,41 +1983,56 @@ sw buf_parse_map_key (s_buf *buf, s_tag *dest)
return r;
}
-buf_parse_map_key_str (s_buf *buf, s_tag *dest)
+sw buf_parse_map_key_sym (s_buf *buf, s_tag *dest)
{
+ sw r;
+ sw result = 0;
s_buf_save save;
s_str str;
- s_tag tag;
assert(buf);
assert(dest);
buf_save_init(buf, &save);
- if ((r = buf_parse_str(buf, &str)) < 0)
+ if ((r = buf_parse_sym_str(buf, &str)) < 0)
goto clean;
if (r > 0) {
result += r;
- if ((r = buf_read_1(buf, ":")) < 0)
- goto restore;
- if (r > 0) {
- result += r;
- dest->type = TAG_SYM;
- dest->data.sym = str_to_sym(&str);
- str_clean(&str);
- goto ok;
- }
- if ((r = buf_parse_comments(buf)) < 0)
- goto restore;
- result += r;
- if ((r = buf_ignore_spaces(buf)) <= 0)
- goto restore;
- result += r;
- if ((r = buf_read_1(buf, "=>")) <= 0)
+ if ((r = buf_read_1(buf, ":")) <= 0)
goto restore;
result += r;
- dest->type = TAG_STR;
- dest->data.str = str;
- goto ok;
+ dest->type = TAG_SYM;
+ dest->data.sym = str_to_sym(&str);
+ str_clean(&str);
}
- ok:
+ r = result;
+ goto clean;
+ restore:
+ buf_save_restore_rpos(buf, &save);
+ clean:
+ buf_save_clean(buf, &save);
+ return r;
+}
+
+sw buf_parse_map_key_tag (s_buf *buf, s_tag *dest)
+{
+ sw r;
+ sw result = 0;
+ s_buf_save save;
+ s_tag tag;
+ assert(buf);
+ assert(dest);
+ buf_save_init(buf, &save);
+ if ((r = buf_parse_tag(buf, &tag)) <= 0)
+ goto restore;
+ if ((r = buf_parse_comments(buf)) < 0)
+ goto restore;
+ result += r;
+ if ((r = buf_ignore_spaces(buf)) <= 0)
+ goto restore;
+ result += r;
+ if ((r = buf_read_1(buf, "=>")) <= 0)
+ goto restore;
+ result += r;
+ *dest = tag;
r = result;
goto clean;
restore:
diff --git a/libc3/buf_parse.h b/libc3/buf_parse.h
index 3287a9f..d432c0e 100644
--- a/libc3/buf_parse.h
+++ b/libc3/buf_parse.h
@@ -81,6 +81,9 @@ sw buf_parse_list (s_buf *buf, s_list **dest);
sw buf_parse_list_paren (s_buf *buf, s_list **dest);
sw buf_parse_map (s_buf *buf, s_map *dest);
sw buf_parse_map_key (s_buf *buf, s_tag *dest);
+sw buf_parse_map_key_str (s_buf *buf, s_tag *dest);
+sw buf_parse_map_key_sym (s_buf *buf, s_tag *dest);
+sw buf_parse_map_key_tag (s_buf *buf, s_tag *dest);
sw buf_parse_module_name (s_buf *buf, const s_sym **dest);
sw buf_parse_new_tag (s_buf *buf, s_tag **dest);
sw buf_parse_paren_sym (s_buf *buf, const s_sym **dest);