Fixed more [] uses on Anarki.

lathe · Apr 8, 2012 · a5c0ad5 · a5c0ad5
1 parent 2d4cfb3
commit a5c0ad5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/arc/more-module-stuff.arc b/arc/more-module-stuff.arc
@@ -168,7 +168,9 @@
   `(let nmap (table)
      (w/global my nspace.nmap
        (tldo ,@body))
-     (pack-nmap:copy nmap ,@(mappend [do `(',_ nil)] names))))
+     ; NOTE: In Anarki, [do `(',_ nil)] is nullary because of the
+     ; quote.
+     (pack-nmap:copy nmap ,@(mappend (fn (_) `(',_ nil)) names))))
 
 
 ; originally from modules/path.arc

diff --git a/arc/orc/orc.arc b/arc/orc/orc.arc
@@ -37,7 +37,9 @@
 
 (=mc my.def-inherits (subtype . supertypes)
   `(,my!fn-def-inherits
-     ,@(map [do `',deglobalize._] (cons subtype supertypes))))
+     ; NOTE: In Anarki, [do `',deglobalize._] is nullary thanks to the
+     ; quote.
+     ,@(map (fn (_) `',deglobalize._) (cons subtype supertypes))))
 
 (=fn my.isinstance (x test-type)
   (my.inherits my.otype.x test-type))
@@ -59,7 +61,8 @@
 ; types, such as Java objects and tables with their 'type fields set.
 (=fn my.otype (x)
   (case x nil my!niltype
-    (on-err [do my!any] (fn () type.x))))
+    ; NOTE: In Anarki, [do my!any] is nullary.
+    (on-err (fn (_) my!any) (fn () type.x))))
 
 
 ; == A mechanism for rules which dispatch lexicographically by type ==