Skip to content

Commit a2973ab

Browse files
kanakakanaka
committed
xslt, c, zig: test for, fix seq parsing EOF errors
xslt: - The reader was returning the an odd args error when a hash-map literal was not closed. This was because the the parsing error happened and then the odd args test happened after and overwrote the parsing error. - Also, fix the read-string function so that if an error is set by the reader, this is converted to a full error that bubbles up. c: - read_list errors were not being detected/propagated in read_hash_map after calling read_list. zig: - reader errors were not being caught in the rep loop until step 8, so those errors in step6 and step7 were causing the REPL to exit.
1 parent 39563fd commit a2973ab

14 files changed

+121
-71
lines changed

‎impls/c/reader.c

+3-2
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ MalVal *read_list(Reader *reader, MalType type, char start, char end) {
132132
MalVal *ast, *form;
133133
char *token = reader_next(reader);
134134
//g_print("read_list start token: %s\n", token);
135-
if (token[0] != start) { abort("expected '(' or '['"); }
135+
if (token[0] != start) { abort("expected '(', '[', or '{'"); }
136136

137137
ast = malval_new_list(type, g_array_new(TRUE, TRUE, sizeof(MalVal*)));
138138

@@ -148,14 +148,15 @@ MalVal *read_list(Reader *reader, MalType type, char start, char end) {
148148
}
149149
g_array_append_val(ast->val.array, form);
150150
}
151-
if (!token) { abort("expected ')' or ']', got EOF"); }
151+
if (!token) { abort("expected ')', ']', or '}', got EOF"); }
152152
reader_next(reader);
153153
//g_print("read_list end token: %s\n", token);
154154
return ast;
155155
}
156156

157157
MalVal *read_hash_map(Reader *reader) {
158158
MalVal *lst = read_list(reader, MAL_LIST, '{', '}');
159+
if (!lst) { return NULL; }
159160
MalVal *hm = _hash_map(lst);
160161
malval_free(lst);
161162
return hm;

‎impls/tests/step1_read_print.mal

+2
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ false
142142
;/.*(EOF|end of input|unbalanced).*
143143
[1 2
144144
;/.*(EOF|end of input|unbalanced).*
145+
{"a" 2
146+
;/.*(EOF|end of input|unbalanced).*
145147

146148
;;; These should throw some error with no return value
147149
"abc

‎impls/tests/step6_file.mal

+8-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
;;; Differing output, but make sure no fatal error
2525
(read-string ";; comment")
2626

27-
2827
(eval (read-string "(+ 2 3)"))
2928
;=>5
3029

@@ -112,6 +111,14 @@
112111
;;
113112
;; -------- Deferrable Functionality --------
114113

114+
;; Testing read-string parsing errors
115+
(read-string "(+ 1")
116+
;/.*(EOF|end of input|unbalanced).*
117+
(read-string "[+ 1")
118+
;/.*(EOF|end of input|unbalanced).*
119+
(read-string "{:a 1")
120+
;/.*(EOF|end of input|unbalanced).*
121+
115122
;; Testing reading of large files
116123
(load-file "../tests/computations.mal")
117124
;=>nil

‎impls/tests/step9_try.mal

+9-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
(try* (map throw (list "my err")) (catch* exc exc))
4242
;=>"my err"
4343

44-
4544
;;
4645
;; Testing builtin functions
4746

@@ -113,6 +112,14 @@
113112
;; ------- Deferrable Functionality ----------
114113
;; ------- (Needed for self-hosting) -------
115114

115+
;; Test catch of reader errors
116+
(try* (eval (read-string "(+ 1")) (catch* e (prn :e e)))
117+
;/.*(EOF|end of input|unbalanced).*
118+
(try* (eval (read-string "[+ 1")) (catch* e (prn :e e)))
119+
;/.*(EOF|end of input|unbalanced).*
120+
(try* (eval (read-string "{:a 1")) (catch* e (prn :e e)))
121+
;/.*(EOF|end of input|unbalanced).*
122+
116123
;; Testing symbol and keyword functions
117124
(symbol? :abc)
118125
;=>false
@@ -413,4 +420,4 @@
413420
(bar {:foo (fn* [x] x)})
414421
(bar {:foo 3})
415422
;=>{:foo 3}
416-
;; shouldn't give an error
423+
;; shouldn't give an error

‎impls/xslt/core.xslt

+10-2
Original file line numberDiff line numberDiff line change
@@ -358,8 +358,16 @@
358358
<xsl:value-of select="$args/value/malval/lvalue/malval[1]/@value"/>
359359
</str>
360360
</xsl:variable>
361-
<xsl:for-each select="$read-string-context">
362-
<xsl:call-template name="malreader-read_str"/>
361+
<xsl:variable name="form">
362+
<xsl:for-each select="$read-string-context">
363+
<xsl:call-template name="malreader-read_str"/>
364+
</xsl:for-each>
365+
</xsl:variable>
366+
<xsl:for-each select="$form">
367+
<xsl:if test="error">
368+
<xsl:value-of select="error(QName('MAL', 'Error'), string(error), core:makeMALValue(string(error), 'string'))"/>
369+
</xsl:if>
370+
<xsl:copy-of select="."/>
363371
</xsl:for-each>
364372
</xsl:when>
365373
<xsl:when test="$func/malval/@name = 'slurp'">

‎impls/xslt/reader.xslt

+4-1
Original file line numberDiff line numberDiff line change
@@ -347,6 +347,9 @@
347347
</value>
348348
</xsl:variable>
349349
<xsl:choose>
350+
<xsl:when test="error">
351+
<xsl:copy-of select="."/>
352+
</xsl:when>
350353
<xsl:when test="$listkind = '{'">
351354
<xsl:choose>
352355
<xsl:when test="count($value/value/malval/lvalue/malval) mod 2 = 1">
@@ -419,7 +422,7 @@
419422
</xsl:when>
420423
<xsl:otherwise>
421424
<error>
422-
<malval kind="error">EOF while reading list</malval>
425+
<malval kind="error">EOF while reading sequence</malval>
423426
</error>
424427
</xsl:otherwise>
425428
</xsl:choose>

‎impls/zig/step3_env.zig

+1-1
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ fn EVAL_let(mal: *MalType, env: *Env) MalError!*MalType {
8989
optional_node = iterator.next();
9090
key_mal.delete(Allocator);
9191
}
92-
92+
9393
linked_list.destroy(Allocator, &binding_ll, true);
9494
binding_arg.data = MalData{.Nil=undefined};
9595
mal.delete(Allocator);

‎impls/zig/step4_if_fn_do.zig

+1-1
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ fn EVAL_let(mal: *MalType, env: *Env) MalError!*MalType {
100100
optional_node = iterator.next();
101101
key_mal.delete(Allocator);
102102
}
103-
103+
104104
linked_list.destroy(Allocator, &binding_ll, true);
105105
binding_arg.data = MalData{.Nil=undefined};
106106
mal.delete(Allocator);

‎impls/zig/step5_tco.zig

+2-2
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ fn EVAL_let(mal_ptr: **MalType, env_ptr: **Env) MalError!void {
108108
optional_node = iterator.next();
109109
key_mal.delete(Allocator);
110110
}
111-
111+
112112
linked_list.destroy(Allocator, &binding_ll, true);
113113
binding_arg.data = MalData{.Nil=undefined};
114114
mal.delete(Allocator);
@@ -275,7 +275,7 @@ fn make_environment() MalError!*Env {
275275
if(optional_output) |output| {
276276
Allocator.free(output);
277277
}
278-
278+
279279
return environment;
280280
}
281281

‎impls/zig/step6_file.zig

+28-17
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ fn EVAL_let(mal_ptr: **MalType, env_ptr: **Env) MalError!void {
124124
optional_node = iterator.next();
125125
key_mal.delete(Allocator);
126126
}
127-
127+
128128
linked_list.destroy(Allocator, &binding_ll, true);
129129
binding_arg.data = MalData{.Nil=undefined};
130130
binding_arg.delete(Allocator);
@@ -202,8 +202,27 @@ fn rep(environment: *Env, input: [] const u8) MalError!?[] u8 {
202202
return print_input;
203203
}
204204

205+
fn rep_and_print_errors(environment: *Env, input: [] const u8) ?[]u8 {
206+
return rep(environment, input) catch |err| {
207+
switch(err) {
208+
MalError.KeyError => { },
209+
MalError.OutOfBounds => {
210+
warn("Error: out of bounds\n");
211+
},
212+
MalError.ReaderUnmatchedParen => {
213+
warn("Error: expected closing paren, got EOF\n");
214+
},
215+
else => {
216+
warn("Unhandled error\n");
217+
},
218+
}
219+
return null;
220+
};
221+
}
222+
223+
205224
fn lookup(environment: *Env, symbol: []const u8, do_warn: bool) MalError!*MalType {
206-
var mal = environment.get(symbol) catch |err| {
225+
var mal = environment.get(symbol) catch |err| {
207226
if(do_warn) {
208227
const s1 = string_concat(Allocator, "'", symbol) catch return MalError.SystemError;
209228
const s2 = string_concat(Allocator, s1, "' not found") catch return MalError.SystemError;
@@ -290,7 +309,7 @@ fn make_environment() MalError!*Env {
290309
const eval_mal = try MalType.new_nil(Allocator);
291310
eval_mal.data = MalData{.Fn1 = &eval};
292311
try environment.set("eval", eval_mal);
293-
312+
294313
const def_not_string: [] const u8 =
295314
\\(def! not (fn* (a) (if a false true)))
296315
;
@@ -351,21 +370,13 @@ pub fn main() !void {
351370
var output = try rep(environment, run_cmd);
352371
return;
353372
}
354-
373+
355374
while(true) {
356375
var line = (try getline(Allocator)) orelse break;
357-
var optional_output = rep(environment, line) catch |err| {
358-
if(err == MalError.KeyError) {
359-
continue;
360-
} else {
361-
return err;
362-
}
363-
};
364-
if(optional_output) |output| {
365-
try stdout_file.write(output);
366-
Allocator.free(output);
367-
Allocator.free(line);
368-
try stdout_file.write("\n");
369-
}
376+
var output = rep_and_print_errors(environment, line) orelse continue;
377+
try stdout_file.write(output);
378+
Allocator.free(output);
379+
Allocator.free(line);
380+
try stdout_file.write("\n");
370381
}
371382
}

‎impls/zig/step7_quote.zig

+28-17
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ fn EVAL_let(mal_ptr: **MalType, env_ptr: **Env) MalError!void {
156156
optional_node = iterator.next();
157157
key_mal.delete(Allocator);
158158
}
159-
159+
160160
linked_list.destroy(Allocator, &binding_ll, true);
161161
binding_arg.data = MalData{.Nil=undefined};
162162
binding_arg.delete(Allocator);
@@ -287,8 +287,27 @@ fn rep(environment: *Env, input: [] const u8) MalError!?[] u8 {
287287
return print_input;
288288
}
289289

290+
fn rep_and_print_errors(environment: *Env, input: [] const u8) ?[]u8 {
291+
return rep(environment, input) catch |err| {
292+
switch(err) {
293+
MalError.KeyError => { },
294+
MalError.OutOfBounds => {
295+
warn("Error: out of bounds\n");
296+
},
297+
MalError.ReaderUnmatchedParen => {
298+
warn("Error: expected closing paren, got EOF\n");
299+
},
300+
else => {
301+
warn("Unhandled error\n");
302+
},
303+
}
304+
return null;
305+
};
306+
}
307+
308+
290309
fn lookup(environment: *Env, symbol: []const u8, do_warn: bool) MalError!*MalType {
291-
var mal = environment.get(symbol) catch |err| {
310+
var mal = environment.get(symbol) catch |err| {
292311
if(do_warn) {
293312
const s1 = string_concat(Allocator, "'", symbol) catch return MalError.SystemError;
294313
const s2 = string_concat(Allocator, s1, "' not found") catch return MalError.SystemError;
@@ -375,7 +394,7 @@ fn make_environment() MalError!*Env {
375394
const eval_mal = try MalType.new_nil(Allocator);
376395
eval_mal.data = MalData{.Fn1 = &eval};
377396
try environment.set("eval", eval_mal);
378-
397+
379398
const def_not_string: [] const u8 =
380399
\\(def! not (fn* (a) (if a false true)))
381400
;
@@ -436,21 +455,13 @@ pub fn main() !void {
436455
var output = try rep(environment, run_cmd);
437456
return;
438457
}
439-
458+
440459
while(true) {
441460
var line = (try getline(Allocator)) orelse break;
442-
var optional_output = rep(environment, line) catch |err| {
443-
if(err == MalError.KeyError) {
444-
continue;
445-
} else {
446-
return err;
447-
}
448-
};
449-
if(optional_output) |output| {
450-
try stdout_file.write(output);
451-
Allocator.free(output);
452-
Allocator.free(line);
453-
try stdout_file.write("\n");
454-
}
461+
var output = rep_and_print_errors(environment, line) orelse continue;
462+
try stdout_file.write(output);
463+
Allocator.free(output);
464+
Allocator.free(line);
465+
try stdout_file.write("\n");
455466
}
456467
}

‎impls/zig/step8_macros.zig

+5-5
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ fn macroexpand(mal: *MalType, env: *Env) MalError!*MalType {
164164
first.delete(Allocator);
165165
}
166166
try linked_list.prepend_mal(Allocator, &new_list, macro);
167-
var new_mal = try apply_function(Allocator, new_list);
168-
linked_list.destroy(Allocator, &new_list, false);
167+
var new_mal = try apply_function(Allocator, new_list);
168+
linked_list.destroy(Allocator, &new_list, false);
169169
cur_mal.shallow_destroy(Allocator);
170170
cur_mal = new_mal;
171171
optional_macro = is_macro_call(cur_mal, env);
@@ -216,7 +216,7 @@ fn EVAL_let(mal_ptr: **MalType, env_ptr: **Env) MalError!void {
216216
optional_node = iterator.next();
217217
key_mal.delete(Allocator);
218218
}
219-
219+
220220
linked_list.destroy(Allocator, &binding_ll, true);
221221
binding_arg.data = MalData{.Nil=undefined};
222222
binding_arg.delete(Allocator);
@@ -367,7 +367,7 @@ fn rep_and_print_errors(environment: *Env, input: [] const u8) ?[]u8 {
367367

368368

369369
fn lookup(environment: *Env, symbol: []const u8, do_warn: bool) MalError!*MalType {
370-
var mal = environment.get(symbol) catch |err| {
370+
var mal = environment.get(symbol) catch |err| {
371371
if(do_warn) {
372372
const s1 = string_concat(Allocator, "'", symbol) catch return MalError.SystemError;
373373
const s2 = string_concat(Allocator, s1, "' not found") catch return MalError.SystemError;
@@ -462,7 +462,7 @@ fn make_environment() MalError!*Env {
462462
if(optional_output) |output| {
463463
Allocator.free(output);
464464
}
465-
465+
466466
const load_file_string: [] const u8 =
467467
\\(def! load-file (fn* (f) (eval (read-string (str "(do " (slurp f) "\nnil)")))))
468468
;

0 commit comments

Comments
 (0)