Commit af05ffb2e5fc44d133f803f927dd3269f106f2ca
2024-08-01T13:34:35
wip buf_parse
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 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210
diff --git a/libkc3/buf_parse.c b/libkc3/buf_parse.c
index 51b08c5..9264482 100644
--- a/libkc3/buf_parse.c
+++ b/libkc3/buf_parse.c
@@ -460,29 +460,29 @@ sw buf_parse_block_inner (s_buf *buf, bool short_form, s_block *block)
s_list *list = 0;
sw r;
sw result = 0;
+ s_buf_save save;
s_tag tag;
s_block tmp;
i = &list;
*i = NULL;
+ buf_save_init(buf, &save);
while (1) {
if (short_form) {
if ((r = buf_read_1(buf, "}")) < 0) {
err_puts("buf_parse_block_inner: buf_read_1 \"}\"");
assert(! "buf_parse_block_inner: buf_read_1 \"}\"");
- goto clean;
+ goto restore;
}
}
else if ((r = buf_read_sym(buf, &g_sym_end)) < 0) {
err_puts("buf_parse_block_inner: buf_read_sym :end");
assert(! "buf_parse_block_inner: buf_read_sym :end");
- goto clean;
+ goto restore;
}
if (r > 0)
goto ok;
if ((r = buf_parse_tag(buf, &tag)) < 0) {
- err_puts("buf_parse_block_inner: buf_parse_tag < 0");
- assert(! "buf_parse_block_inner: buf_parse_tag < 0");
- goto clean;
+ goto restore;
}
result += r;
if (r > 0) {
@@ -490,7 +490,7 @@ sw buf_parse_block_inner (s_buf *buf, bool short_form, s_block *block)
if (! *i) {
err_puts("buf_parse_block_inner: list_new");
assert(! "buf_parse_block_inner: list_new");
- goto clean;
+ goto restore;
}
(*i)->tag = tag;
i = &(*i)->next.data.list;
@@ -498,7 +498,7 @@ sw buf_parse_block_inner (s_buf *buf, bool short_form, s_block *block)
if ((r = buf_parse_comments(buf)) < 0) {
err_puts("buf_parse_block_inner: buf_parse_comments 1");
assert(! "buf_parse_block_inner: buf_parse_comments 1");
- goto clean;
+ goto restore;
}
result += r;
if ((r = buf_ignore_spaces_but_newline(buf)) < 0) {
@@ -506,20 +506,20 @@ sw buf_parse_block_inner (s_buf *buf, bool short_form, s_block *block)
" buf_ignore_spaces_but_newline 1");
assert(!("buf_parse_block_inner:"
" buf_ignore_spaces_but_newline 1"));
- goto clean;
+ goto restore;
}
result += r;
if (short_form) {
if ((r = buf_read_1(buf, "}")) < 0) {
err_puts("buf_parse_block_inner: buf_read_1 \"}\" < 0");
assert(! "buf_parse_block_inner: buf_read_1 \"}\" < 0");
- goto clean;
+ goto restore;
}
}
else if ((r = buf_read_sym(buf, &g_sym_end)) < 0) {
err_puts("buf_parse_block_inner: buf_read_sym :end < 0");
assert(! "buf_parse_block_inner: buf_read_sym :end < 0");
- goto clean;
+ goto restore;
}
if (r > 0)
goto ok;
@@ -530,7 +530,7 @@ sw buf_parse_block_inner (s_buf *buf, bool short_form, s_block *block)
err_inspect_buf(buf);
err_write_1("\n");
assert(! "buf_parse_block_inner: missing separator");
- goto clean;
+ goto restore;
}
if (! r) {
if ((r = buf_read_1(buf, ";")) <= 0) {
@@ -540,14 +540,14 @@ sw buf_parse_block_inner (s_buf *buf, bool short_form, s_block *block)
err_inspect_buf(buf);
err_write_1("\n");
assert(! "buf_parse_block_inner: missing separator");
- goto clean;
+ goto restore;
}
}
result += r;
if ((r = buf_parse_comments(buf)) < 0) {
err_puts("buf_parse_block_inner: buf_parse_comments 2");
assert(! "buf_parse_block_inner: buf_parse_comments 2");
- goto clean;
+ goto restore;
}
result += r;
if ((r = buf_ignore_spaces_but_newline(buf)) < 0) {
@@ -555,14 +555,17 @@ sw buf_parse_block_inner (s_buf *buf, bool short_form, s_block *block)
" buf_ignore_spaces_but_newline 2");
assert(!("buf_parse_block_inner:"
" buf_ignore_spaces_but_newline 2"));
- goto clean;
+ goto restore;
}
result += r;
}
r = 0;
+ restore:
+ buf_save_restore_rpos(buf, &save);
clean:
if (list)
list_delete_all(list);
+ buf_save_clean(buf, &save);
return r;
ok:
result += r;
@@ -1683,7 +1686,7 @@ sw buf_parse_fact (s_buf *buf, s_fact_w *dest)
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 = tmp;
diff --git a/libkc3/facts.c b/libkc3/facts.c
index 01353b8..66a2255 100644
--- a/libkc3/facts.c
+++ b/libkc3/facts.c
@@ -310,7 +310,6 @@ sw facts_load (s_facts *facts, s_buf *buf, const s_str *path)
s_fact_w fact;
s_fact_w fact_eval;
s_fact fact_eval_r;
- u64 line;
sw r;
bool replace;
sw result = 0;
@@ -326,7 +325,6 @@ sw facts_load (s_facts *facts, s_buf *buf, const s_str *path)
}
result += r;
facts_lock_w(facts);
- line = 3;
while (1) {
if ((r = buf_read_1(buf, "replace ")) < 0)
break;
@@ -340,7 +338,7 @@ sw facts_load (s_facts *facts, s_buf *buf, const s_str *path)
result += r;
if ((r = buf_parse_fact(buf, &fact)) <= 0) {
err_write_1("facts_load: invalid fact line ");
- err_inspect_u64(&line);
+ err_inspect_sw_decimal(&buf->line);
err_write_1(": ");
err_puts(path->ptr.pchar);
assert(! "facts_load: invalid fact");
@@ -350,7 +348,7 @@ sw facts_load (s_facts *facts, s_buf *buf, const s_str *path)
if ((r = buf_read_1(buf, "\n")) <= 0) {
fact_w_clean(&fact);
err_write_1("facts_load: missing newline line ");
- err_inspect_u64(&line);
+ err_inspect_sw_decimal(&buf->line);
err_write_1(": ");
err_puts(path->ptr.pchar);
assert(! "facts_load: missing newline");
@@ -359,8 +357,8 @@ sw facts_load (s_facts *facts, s_buf *buf, const s_str *path)
result += r;
if (! fact_w_eval(&fact, &fact_eval)) {
fact_w_clean(&fact);
- err_write_1("facts_load: invalid fact line ");
- err_inspect_u64(&line);
+ err_write_1("facts_load: failed to eval fact line ");
+ err_inspect_sw_decimal(&buf->line);
err_write_1(": ");
err_puts(path->ptr.pchar);
assert(! "facts_load: invalid fact");
@@ -372,7 +370,7 @@ sw facts_load (s_facts *facts, s_buf *buf, const s_str *path)
fact_w_clean(&fact_eval);
fact_w_clean(&fact);
err_write_1("facts_load: failed to replace fact line ");
- err_inspect_u64(&line);
+ err_inspect_sw_decimal(&buf->line);
err_write_1(": ");
err_puts(path->ptr.pchar);
assert(! "facts_load: failed to replace fact");
@@ -384,7 +382,7 @@ sw facts_load (s_facts *facts, s_buf *buf, const s_str *path)
fact_w_clean(&fact_eval);
fact_w_clean(&fact);
err_write_1("facts_load: failed to add fact line ");
- err_inspect_u64(&line);
+ err_inspect_sw_decimal(&buf->line);
err_write_1(": ");
err_puts(path->ptr.pchar);
assert(! "facts_load: failed to add fact");
@@ -393,7 +391,6 @@ sw facts_load (s_facts *facts, s_buf *buf, const s_str *path)
}
fact_w_clean(&fact);
fact_w_clean(&fact_eval);
- line++;
}
facts_lock_unlock_w(facts);
return result;