build/out.mjs

@@ -6489,7 +6489,7 @@ var __emscripten_stack_alloc = (a0) => (__emscripten_stack_alloc = wasmExports['
 var _emscripten_stack_get_current = () => (_emscripten_stack_get_current = wasmExports['emscripten_stack_get_current'])();
 var ___cxa_is_pointer_type = createExportWrapper('__cxa_is_pointer_type', 1);
 var dynCall_jiji = Module['dynCall_jiji'] = createExportWrapper('dynCall_jiji', 5);
-var ___emscripten_embedded_file_data = Module['___emscripten_embedded_file_data'] = 1826368;
+var ___emscripten_embedded_file_data = Module['___emscripten_embedded_file_data'] = 1826680;
 function invoke_i(index) {
   var sp = stackSave();
   try {

package-lock.json

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ludus/ludus-js-pure",
-  "version": "0.1.20",
+  "version": "0.1.18",
   "description": "A Ludus interpreter in a pure JS function.",
   "type": "module",
   "main": "build/ludus.mjs",

prelude.ld

@@ -776,7 +776,7 @@ fn diff {
 fn get {
 	"Takes a key, dict, and optional default value; returns the value at key. If the value is not found, returns nil or the default value."
 	(key as :keyword) -> get (key, _)
-	(key as :keyword, dict as :dict) -> get (key, dict, nil)
+	(key as :keyword, dict as :dict) -> get (key, dict)
 	(key as :keyword, dict as :dict, default) -> base :get (key, dict, default) 
 }
 
@@ -1062,7 +1062,7 @@ let turtle_init = #{
 	:position (0, 0) & let's call this the origin for now
 	:heading 0 & this is straight up
 	:pendown? true
-	:pencolor colors :white
+	:color colors :white
 	:penwidth 1
 	:visible? true
 }
@@ -1112,10 +1112,7 @@ fn render_turtle! () -> {
 		then {
 			let (r, g, b, a) = turtle_color
 			add_call! ((:fill, r, g, b, a))
-			let #{heading
+			let #{heading, :position (x, y), ...} = state
-				:pencolor (pen_r, pen_g, pen_b, pen_a)
-				:position (x, y) 
-				...} = state
 			let first = mult ((0, 1), turtle_radius)
 			let (x1, y1) = first
 			let (x2, y2) = rotate (first, turtle_angle)
@@ -1130,7 +1127,7 @@ fn render_turtle! () -> {
 			add_call! ((:vertex, x3, y3))
 			add_call! ((:endShape))
 			& there's a happy bug here: the stroke will be the same width as the pen width. Keep this for now. Consider also showing the pen colour here?
-			add_call! ((:stroke, pen_r, pen_g, pen_b, pen_a))
+			add_call! ((:stroke, 0))
 			add_call! ((:line, 0, 0, x1, y1))
 			add_call! ((:pop))
 			:ok
@@ -1249,11 +1246,6 @@ fn goto! {
 	((x, y)) -> goto! (x, y)
 }
 
-fn setheading! {
-	"Sets the turtle's heading. The angle is specified in turns, with 0 pointing up. Increasing values rotate the turtle counter-clockwise."
-	(heading as :number) -> add_command! ((:setheading, heading))
-}
-
 fn heading/vector {
 	"Takes a turtle heading, and returns a unit vector of that heading."
 	(heading) -> {
@@ -1266,10 +1258,8 @@ fn heading/vector {
 fn apply_command {
 	"Takes a turtle state and a command and calculates a new state."
 	(state, command) -> match command with {
-		(:goto, (x, y)) -> assoc (state, :position, (x, y))
+		(:goto, (x, y)) -> assoc (state, :position, (neg (x), y))
-		(:home) -> do state > 
+		(:home) -> assoc (state, :position, (0, 0))
-			assoc (_, :position, (0, 0)) >
-			assoc (_, :heading, 0)
 		(:clear) -> assoc (state, :position, (0, 0))
 		(:right, turns) -> update (state, :heading, add (_, turns))
 		(:left, turns) -> update (state, :heading, sub (_, turns))
@@ -1289,7 +1279,6 @@ fn apply_command {
 		(:pendown) -> assoc (state, :pendown?, true)
 		(:penwidth, pixels) -> assoc (state, :penwidth, pixels)
 		(:pencolor, color) -> assoc (state, :pencolor, color)
-		(:setheading, heading) -> assoc (state, :heading, heading)
 	}
 }
 
@@ -1330,7 +1319,7 @@ fn pencolor {
 
 fn penwidth {
 	"Returns the turtle's pen width in pixels."
-	() -> turtle_state () :penwidth
+	() -> turtle_state () :pencolor
 }
 
 box state = nil
@@ -1465,7 +1454,6 @@ pkg Prelude {
 	sentence & lists strings
 	set & sets
 	set? & sets
-	setheading! & turtles
 	show & strings
 	sin & math
 	slice & lists tuples strings

src/ludus.janet

@@ -52,14 +52,13 @@
 (comment
 # (do
 (def source `
-forward! (100)
+words ("foo bar ba,;;;!!!z")
 `)
 (def out (-> source 
  ludus
  j/decode
  ))
 (setdyn :out stdout)
-(pp out)
 (def console (out "console"))
 (print console)
 (def result (out "result"))