From 82cfd3e54b5910843c091a9fb6ef3ad6b64ba757 Mon Sep 17 00:00:00 2001
From: Bruce Hill <bitbucket@bruce-hill.com>
Date: Thu, 14 Jun 2018 21:59:25 -0700
Subject: More streamlining and cleanup. Especially for
 core/metaprogramming.nom

---
 core/collections.nom | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'core/collections.nom')

diff --git a/core/collections.nom b/core/collections.nom
index a8a28b2..8a59852 100644
--- a/core/collections.nom
+++ b/core/collections.nom
@@ -16,8 +16,8 @@ immediately
     ..to: Lua value "utils.nth_to_last(\(%list as lua expr), \(%index as lua expr))"
 
 immediately
-    parse [first in %list, first %list] as: 1 st in %list
-    parse [last in %list, last %list] as: 1 st to last in %list
+    parse [last in %list] as: 1st to last in %list
+    parse [first in %list] as: %list.1
 
 # Membership testing
 immediately
@@ -62,8 +62,8 @@ immediately
     parse [%expression for %item in %iterable] as
         result of
             %comprehension <- []
-            for %i = %item in %iterable
-                %comprehension.%i <- %expression
+            for %item in %iterable
+                add %expression to %comprehension
             return %comprehension
 
     parse [..]
@@ -163,8 +163,8 @@ immediately
         %unique <- []
         %seen <- {}
         for % in %items
-            unless: % in %seen
+            unless: %seen.%
                 add % to %unique
-                (% in %seen) <- (yes)
+                %seen.% <- (yes)
         return %unique
 
-- 
cgit v1.2.3