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

fix string interpolation, prelude bugs

Browse Source
This commit is contained in:
Scott Richmond 2024-06-07 15:04:06 -04:00
parent a6e2e11e4a
commit 4d0a37328d
5 changed files with 42 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
prelude.ld
View File

@ -249,33 +249,32 @@ fn concat {
& the console: sending messages to the outside world & the console: sending messages to the outside world
& the console is *both* something we send to the host language's console & the console is *both* something we send to the host language's console
& ...and also a list of messages. & ...and also a list of messages.
box console = [] & box console = []
fn flush! { & fn flush! {
"Clears the console, and returns the messages." & "Clears the console, and returns the messages."
() -> { & () -> {
let msgs = unbox (console) & let msgs = unbox (console)
store! (console, []) & store! (console, [])
msgs & msgs
} & }
} & }
fn add_msg! { & fn add_msg! {
"Adds a message to the console." & "Adds a message to the console."
(msg as :string) -> update! (console, append (_, msg)) & (msg as :string) -> update! (console, append (_, msg))
(msgs as :list) -> { & (msgs as :list) -> {
base :print! (("adding msg", msgs)) & base :print! (("adding msg", msgs))
let msg = do msgs > map (string, _) > join & let msg = do msgs > map (string, _) > join
base :print! (("msg: ", msg)) & base :print! (("msg: ", msg))
update! (console, append (_, msg)) & update! (console, append (_, msg))
} & }
} & }
fn print! { fn print! {
"Sends a text representation of Ludus values to the console." "Sends a text representation of Ludus values to the console."
(...args) -> { (...args) -> {
base :print! (args) base :print! (args)
& add_msg! (args)
:ok :ok
} }
} }
@ -1306,7 +1305,6 @@ pkg Prelude {
coll? coll?
colors colors
concat concat
console
cos cos
count count
dec dec
@ -1332,7 +1330,6 @@ pkg Prelude {
filter filter
first first
floor floor
flush!
fn? fn?
fold fold
forward! forward!

2
src/errors.janet
View File

@ -70,7 +70,7 @@
(print source-line)) (print source-line))
(defn runtime-error [e] (defn runtime-error [e]
(when (= :string (type e)) (print e) (break e)) (when (= :string (type e)) (print (string "Internal Ludus error: " e)) (break e))
(def msg (e :msg)) (def msg (e :msg))
(case msg (case msg
"no match: function call" (fn-no-match e) "no match: function call" (fn-no-match e)

20
src/interpreter.janet
View File

@ -251,7 +251,9 @@
(interpret last-line ctx)) (interpret last-line ctx))
(defn- to_string [ctx] (fn [x] (defn- to_string [ctx] (fn [x]
(b/stringify (interpret x ctx)))) (if (buffer? x)
(string x)
(b/stringify (interpret x ctx)))))
(defn- interpolated [ast ctx] (defn- interpolated [ast ctx]
(def terms (ast :data)) (def terms (ast :data))
@ -620,9 +622,9 @@
(set interpret interpret*) (set interpret interpret*)
# # repl # # repl
# (import ./scanner :as s) # (import /src/scanner :as s)
# (import ./parser :as p) # (import /src/parser :as p)
# (import ./validate :as v) # (import /src/validate :as v)
# (var source nil) # (var source nil)
@ -637,14 +639,16 @@
# # (when (has-errors? validated) (break (validated :errors))) # # (when (has-errors? validated) (break (validated :errors)))
# # (def cleaned (get-in parsed [:ast :data 1])) # # (def cleaned (get-in parsed [:ast :data 1]))
# # # (pp cleaned) # # # (pp cleaned)
# # (interpret (parsed :ast) @{:^parent b/ctx}) # (interpret (parsed :ast) @{:^parent b/ctx})
# (try (interpret (parsed :ast) @{:^parent b/ctx}) # # (try (interpret (parsed :ast) @{:^parent b/ctx})
# ([e] (if (struct? e) (error (e :msg)) (error e))))) # # ([e] (if (struct? e) (error (e :msg)) (error e))))
# )
# # (do # # (do
# (comment # (comment
# (set source ` # (set source `
# let foo = 42
# "{foo} bar baz"
# `) # `)
# (def result (run)) # (def result (run))
# ) # )

11
src/ludus.janet
View File

@ -24,13 +24,13 @@
(set (out :errors) (scanned :errors)) (set (out :errors) (scanned :errors))
(each err (scanned :errors) (each err (scanned :errors)
(e/scan-error err)) (e/scan-error err))
(break out)) (break (j/encode out)))
(def parsed (p/parse scanned)) (def parsed (p/parse scanned))
(when (any? (parsed :errors)) (when (any? (parsed :errors))
(set (out :errors) (parsed :errors)) (set (out :errors) (parsed :errors))
(each err (parsed :errors) (each err (parsed :errors)
(e/parse-error err)) (e/parse-error err))
(break out)) (break (j/encode out)))
(def validated (v/valid parsed ctx)) (def validated (v/valid parsed ctx))
(when (any? (validated :errors)) (when (any? (validated :errors))
(set (out :errors) (validated :errors)) (set (out :errors) (validated :errors))
@ -43,7 +43,7 @@
([err] ([err]
(e/runtime-error err) (e/runtime-error err)
(set (out :errors) [err]) (set (out :errors) [err])
(break out))) (break (j/encode out))))
(setdyn :out stdout) (setdyn :out stdout)
(set (out :result) (b/show result)) (set (out :result) (b/show result))
(var post @{}) (var post @{})
@ -53,4 +53,7 @@
(set (out :draw) (post :draw)) (set (out :draw) (post :draw))
(string (j/encode out))) (string (j/encode out)))
(ludus `
let foo = 42
"{foo} bar baz"
`)

5
src/parser.janet
View File

@ -1116,10 +1116,11 @@
# (do # (do
(comment (comment
(def source `... (def source `
"{f} a {f}"
`) `)
(def scanned (s/scan source)) (def scanned (s/scan source))
# (print "\n***NEW PARSE***\n") # (print "\n***NEW PARSE***\n")
(def a-parser (new-parser scanned)) (def a-parser (new-parser scanned))
(def parsed (splat a-parser)) (def parsed (interpolated a-parser))
) )