justfile

@@ -18,7 +18,3 @@ buffer:
 
 doc:
 	sd "$" "\n" | sd "\n\n" "\n" | xargs -I _ echo "(doc " _ ")" | kitten @ send-text -m "title:hx_repl:ludus" --stdin
-
-publish:
-	git commit -am "publishing!"
-

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@ludus/ludus-js-pure",
-  "version": "0.1.7",
+  "version": "0.1.3",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@ludus/ludus-js-pure",
-      "version": "0.1.7",
+      "version": "0.1.3",
       "license": "GPL-3.0",
       "devDependencies": {
         "shadow-cljs": "^2.26.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ludus/ludus-js-pure",
-  "version": "0.1.7",
+  "version": "0.1.5",
   "description": "A Ludus interpreter in a pure JS function.",
   "type": "module",
   "main": "build/ludus.mjs",
@@ -11,7 +11,6 @@
   "files": [
     "build/out.wasm",
     "build/out.mjs",
-    "build/ludus.mjs"
+    "build/ludus.mjs"],
-  ],
   "devDependencies": {}
 }

prelude.ld

@@ -249,32 +249,33 @@ fn concat {
 & the console: sending messages to the outside world
 & the console is *both* something we send to the host language's console
 & ...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! {
 	"Sends a text representation of Ludus values to the console."
 	(...args) -> {
 		base :print! (args)
+		& add_msg! (args)
 		:ok
 	}
 }
@@ -1305,6 +1306,7 @@ pkg Prelude {
 	coll?
 	colors
 	concat
+	console
 	cos
 	count
 	dec
@@ -1330,6 +1332,7 @@ pkg Prelude {
 	filter
 	first
 	floor
+	flush!
 	fn?
 	fold
 	forward!

src/errors.janet

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

src/interpreter.janet

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

src/ludus.janet

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

src/parser.janet

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