Merge branch 'master' of https://git.webbieweb.org/akko/nothoughts

src/cljs/emptyhead/newlib/delegate.cljs

@@ -13,6 +13,13 @@
   (let [remover (thought/register-thought! [:EH :CORE :NOP] :ext-stages [[:EH :MSG :REMOVE-DELEGATE msg del]])]
     (eval/execute! remover)))
 
+
+;; Forget idea stored in `thought`'s data. Used to make destructors.
+(def/define! [:EH :IDEA :FORGET]
+  (fn  [thought parent]
+    (idea/forget-idea! (thought/data thought))
+    [parent nil]))
+
 ;; FIXME Delegate order is currently undefined! Give this a proper order.
 ;; FIXME needs to be called with a list as second arg??
 (defn add-delegate
@@ -34,6 +41,5 @@
   [msg]
   (let [stage [:EH :MSG :DELEGATE msg]
         dels (-> (thought/register-thought! [:EH :CORE :CONTAINER] :ext-stages [stage])
-        eval/execute! thought/pop-stack second)]
+                 eval/execute! thought/empty-stack second)]
-    (mapcat #(cons % (get-delegates %)) dels)
+    (mapcat #(cons % (get-delegates %)) dels)))
-    ))

src/cljs/emptyhead/newlib/math/arithmetic.cljs

@@ -16,7 +16,8 @@
           th (thought/register-thought! [:EH :IO :RETURN]
                                         :data to
                                         :reference (str "<" to "+_>"))]
-      (del/add-delegate th [[:EH :PRIM :PARTIAL :+]])
+
+      (del/add-delegate th [:EH :PRIM :PARTIAL :+])
       [parent th])))
 
 ;; Final addition, e.g. =(5 +) 5=.
@@ -27,7 +28,7 @@
           th (thought/register-thought! [:EH :IO :RETURN]
                                         :data [to from]
                                         :reference (str "<" to "+" from ">"))]
-      (del/add-delegate th [[:EH :LAZY [:EH :PRIM :NUM]]])
+      (del/add-delegate th [:EH :LAZY [:EH :PRIM :NUM]])
       [parent th])))
 
 (def/define! [:EH :LAZY [:EH :PRIM :NUM] :REIFY]
@@ -37,7 +38,7 @@
           from (if (symbol? from) (msg/apply-msg to [:EH :REIFY]) from)]
       [parent (+ to from)])))
 
-(del/add-delegate [:EH :LAZY [:EH :PRIM :NUM]] [[:EH :PRIM :NUM]])
+(del/add-delegate [:EH :LAZY [:EH :PRIM :NUM]] [:EH :PRIM :NUM])
 
 (thought/register-singleton! [:EH :PRIM :PARTIAL :+ [:EH :PRIM :NUM]])
 (msg/register-single-impl [:EH :PRIM :PARTIAL :+] [:EH :PRIM :NUM] [:EH :PRIM :PARTIAL :+ [:EH :PRIM :NUM]])

src/cljs/emptyhead/newlib/scratch.cljs

@@ -8,4 +8,4 @@
             [emptyhead.newlib.math.number]))
 
 ;; XXX why does the second arg need to be wrapped like this?
-(del/add-delegate :! [[:EH :REIFY]])
+(del/add-delegate :! [:EH :REIFY])