From bf37295faeb9535c56671f4b2050260e1b88cd32 Mon Sep 17 00:00:00 2001
From: Bruce Hill <bruce@bruce-hill.com>
Date: Tue, 15 Jan 2019 15:53:31 -0800
Subject: Updating to v6.15, which includes "external (...)" instead of
 separate 'externally' versions of stuff, and some auto-formatting.

---
 lib/core/collections.nom | 62 +++++++++++++++++++-----------------------------
 1 file changed, 25 insertions(+), 37 deletions(-)

(limited to 'lib/core/collections.nom')

diff --git a/lib/core/collections.nom b/lib/core/collections.nom
index 4cf54cd..dbe6900 100644
--- a/lib/core/collections.nom
+++ b/lib/core/collections.nom
@@ -1,4 +1,4 @@
-#!/usr/bin/env nomsu -V6.14
+#!/usr/bin/env nomsu -V6.15.13.8
 #
     This file contains code that supports manipulating and using collections like lists
     and dictionaries.
@@ -44,19 +44,6 @@ test:
     assume ({.x = 1, .y = 1} & {.y = 10, .z = 10}) == {.y = 1}
     assume ({.x = 1, .y = 1} ~ {.y = 10, .z = 10}) == {.x = 1, .z = 10}
 
-test:
-    assume (([[1, 2], [3, 4]] flattened) == [1, 2, 3, 4])
-
-externally ($lists flattened) means:
-    $flat = []
-    for $item in recursive $lists:
-        if ($item is a "List"):
-            for $ in $item:
-                recurse $item on $
-        ..else:
-            $flat, add $item
-    return $flat
-
 test:
     assume ((entries in {.x = 1}) == [{.key = "x", .value = 1}])
 
@@ -118,28 +105,29 @@ test:
 
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-test:
-    assume ((sorted [3, 1, 2]) == [1, 2, 3])
-
-externally [$items sorted, sorted $items] all mean:
-    $copy = [: for $ in $items: add $]
-    sort $copy
-    return $copy
-
-[$items sorted by $item = $key, $items sorted by $item -> $key] all parse as
-    result of:
+external:
+    test:
+        assume ((sorted [3, 1, 2]) == [1, 2, 3])
+    
+    [$items sorted, sorted $items] all mean:
         $copy = [: for $ in $items: add $]
-        sort $copy by $item = $key
+        sort $copy
         return $copy
-
-test:
-    assume ((unique [1, 2, 1, 3, 2, 3]) == [1, 2, 3])
-
-externally (unique $items) means:
-    $unique = []
-    $seen = {}
-    for $ in $items:
-        unless $seen.$:
-            $unique, add $
-            $seen.$ = (yes)
-    return $unique
+    
+    [$items sorted by $item = $key, $items sorted by $item -> $key] all parse as
+        result of:
+            $copy = [: for $ in $items: add $]
+            sort $copy by $item = $key
+            return $copy
+    
+    test:
+        assume ((unique [1, 2, 1, 3, 2, 3]) == [1, 2, 3])
+    
+    (unique $items) means:
+        $unique = []
+        $seen = {}
+        for $ in $items:
+            unless $seen.$:
+                $unique, add $
+                $seen.$ = (yes)
+        return $unique
-- 
cgit v1.2.3