Renamed run -> include

desktop/sources/scripts/commander.js

@@ -34,7 +34,7 @@ function Commander (ronin) {
   }
 
   this.reindent = function () {
-    let val = this._input.value.replace(/\n/g, '').replace(/\( \(/g, '((').replace(/\) \)/g, '))').replace(/ {2}/g, ' ').trim()
+    let val = this._input.value.replace(/\n/g, '').replace(/ +(?= )/g, '').replace(/\( \(/g, '((').replace(/\) \)/g, '))').trim()
     let depth = 0
     for (let i = 0; i < val.length; i++) {
       const c = val.charAt(i)

desktop/sources/scripts/lisp.js

@@ -20,9 +20,9 @@ function Lisp (input, lib) {
 
   const special = {
     include: (input, context) => {
-      const p = input[1].value
-      if (!fs.existsSync(p)) { console.warn('Source', p); return [] }
-      const file = fs.readFileSync(p, { encoding: 'utf-8' })
+      if (!input[1].value || !fs.existsSync(input[1].value)) { console.warn('Source', input[1].value); return [] }
+      const file = fs.readFileSync(input[1].value, { encoding: 'utf-8' })
+      console.log(input, context)
       return interpret(this.parse(file), context)
     },
     let: function (input, context) {

examples/include.lisp

@@ -0,0 +1,4 @@
+; include
+(
+  (include "../examples/recursive.lisp") 
+  (echo line-color))

examples/recursive.lisp

@@ -1,17 +1,16 @@
 ; recursive
-
 (
   (clear) 
-  (def line-color "red")
   (defn rec 
     (v) 
-      (if (gt v 0)
-        ((stroke (circle
+    (if 
+      (gt v 0) 
+      (
+        (stroke 
+          (circle 
             (mul 5 v) 
             (mul 5 v) 
-                  (mul 5 v)) 1 line-color)
-        (rec (sub v 5))))
-  )
-        
-  (rec 100)
-)
+            (mul 5 v)) 1 "red") 
+        (rec 
+          (sub v 5))))) 
+  (rec 100))

examples/run.lisp

@@ -1,4 +0,0 @@
-(
-    (include "../examples/recursive.lisp")
-    (echo line-color)
-)