From c68d08e8b22fe3d5b148f4ae8b3bf8d69538d970 Mon Sep 17 00:00:00 2001
From: Scott Richmond <kredati@users.noreply.github.com>
Date: Tue, 14 May 2024 20:44:43 -0400
Subject: [PATCH] fix imports

---
 janet/parser.janet   |  6 +++---
 janet/validate.janet | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/janet/parser.janet b/janet/parser.janet
index a5862d3..3a2b21e 100644
--- a/janet/parser.janet
+++ b/janet/parser.janet
@@ -1,7 +1,7 @@
 ### A recursive descent parser for Ludus
 
 ### We still need to scan some things
-#(os/cd "janet") # when in repl to do relative imports
+(try (os/cd "janet") ([_] nil)) # when in repl to do relative imports
 (import ./scanner :as s)
 
 (defmacro declare
@@ -1090,8 +1090,8 @@
 )
 
 
-(do
-#(comment
+# (do
+(comment
 (def source `
 loop (1, 2) with (x, y) -> :bar
 `)
diff --git a/janet/validate.janet b/janet/validate.janet
index db3b9ae..a5ef215 100644
--- a/janet/validate.janet
+++ b/janet/validate.janet
@@ -21,9 +21,9 @@ Imports are for a later iteration of Ludus:
 * [ ] correct imports DEFERRED
 )
 
-
-(import ./recursive :as p)
+(try (os/cd "janet") ([_] nil))
 (import ./scanner :as s)
+(import ./parser :as p)
 
 (defn- new-validator [parser]
  (def ast (parser :ast))
@@ -583,8 +583,12 @@ Imports are for a later iteration of Ludus:
 
 (set validate validate*)
 
-(do
-#(comment
+(defn valid [ast]
+ (def validator (new-validator ast))
+ (validate validator))
+
+# (do
+(comment
 (def source `
 fn bar () -> :bar
 fn foo () -> match :foo with {
@@ -594,8 +598,4 @@ fn foo () -> match :foo with {
 `)
 (def scanned (s/scan source))
 (def parsed (p/parse scanned))
-(def validator (new-validator parsed))
-(pp validator)
-(validate validator) 
-(pp parsed)
-)
+(valid parsed))