* parser.y (clause): "Doh" moment. We don't need the special

transformation of the load syntax because the parent location
is already associated with the syntax.

* match.c (v_load): Pull out source location info from
the form itself.

1 files changed, 4 insertions, 3 deletions

diff --git a/match.c b/match.c
index cbb74e3a..08281050 100644
--- a/match.c
+++ b/match.c
@@ -3366,10 +3366,11 @@ static val v_do(match_files_ctx *c)
 
 static val v_load(match_files_ctx *c)
 {
+  uses_or2;
   spec_bind (specline, first_spec, c->spec);
   val args = rest(first_spec);
-  val parent = first(args);
-  val target = txeval(specline, second(args), c->bindings);
+  val parent = or2(cdr(source_loc(specline)), null_string);
+  val target = txeval(specline, first(args), c->bindings);
 
   if (rest(specline))
     sem_error(specline, lit("unexpected material after load"), nao);
@@ -3385,7 +3386,7 @@ static val v_load(match_files_ctx *c)
                    target,
                    cat_str(nappend2(sub_list(split_str(parent, lit("/")),
                                          zero, negone),
-                                cons(target, nil)), lit("/")));
+                                    cons(target, nil)), lit("/")));
     int gc = gc_state(0);
     parse_reset(path);
     yyparse();