twc/ludus
4
0
Fork 0
Code Issues 32 Pull Requests Packages Projects 8 Releases Wiki Activity

fix imports

Browse Source
This commit is contained in:
Scott Richmond 2024-05-14 20:44:43 -04:00
parent 3e9f38ef5c
commit c68d08e8b2
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
janet/parser.janet
View File

@ -1,7 +1,7 @@
### A recursive descent parser for Ludus ### A recursive descent parser for Ludus
### We still need to scan some things ### 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) (import ./scanner :as s)
(defmacro declare (defmacro declare
@ -1090,8 +1090,8 @@
) )
(do # (do
#(comment (comment
(def source ` (def source `
loop (1, 2) with (x, y) -> :bar loop (1, 2) with (x, y) -> :bar
`) `)

18
janet/validate.janet
View File

@ -21,9 +21,9 @@ Imports are for a later iteration of Ludus:
* [ ] correct imports DEFERRED * [ ] correct imports DEFERRED
) )
(try (os/cd "janet") ([_] nil))
(import ./recursive :as p)
(import ./scanner :as s) (import ./scanner :as s)
(import ./parser :as p)
(defn- new-validator [parser] (defn- new-validator [parser]
(def ast (parser :ast)) (def ast (parser :ast))
@ -583,8 +583,12 @@ Imports are for a later iteration of Ludus:
(set validate validate*) (set validate validate*)
(do (defn valid [ast]
#(comment (def validator (new-validator ast))
(validate validator))
# (do
(comment
(def source ` (def source `
fn bar () -> :bar fn bar () -> :bar
fn foo () -> match :foo with { fn foo () -> match :foo with {
@ -594,8 +598,4 @@ fn foo () -> match :foo with {
`) `)
(def scanned (s/scan source)) (def scanned (s/scan source))
(def parsed (p/parse scanned)) (def parsed (p/parse scanned))
(def validator (new-validator parsed)) (valid parsed))
(pp validator)
(validate validator)
(pp parsed)
)