Merge pull request #1193 from andrew-johnson-4/generic-iter

Generic iter
andrew-johnson-4 · Jan 28, 2025 · 2879858 · 2879858
2 parents e6828d7 + 71f19a9
commit 2879858
Showing 4 changed files with 22,946 additions and 21,833 deletions.
diff --git a/BOOTSTRAP/cli.c b/BOOTSTRAP/cli.c
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "lambda_mountain"
-version = "1.20.52"
+version = "1.20.53"
 authors = ["Andrew <andrew@subarctic.org>"]
 license = "MIT"
 description = "Typed Macro Assembler (backed by Coq proofs-of-correctness)"

diff --git a/PLATFORM/C/LIB/common-macros.lm b/PLATFORM/C/LIB/common-macros.lm
@@ -33,12 +33,11 @@ macro ( ('while cond body) )
 
 macro ( ('for-each (item 'in iter) loop) ) (
    (let (uuid iter-term) iter)
-   (while (non-zero (uuid iter-term)) (match (uuid iter-term) (
+   (let (uuid continue-iter) true)
+   (while (uuid continue-iter) (match (.next(&(uuid iter-term))) (
       ()
-      ( (LCons( item (uuid iter-rst) )) (
-         loop
-         (set (uuid iter-term) (uuid iter-rst))
-      ))
+      ( (Some( item )) (loop ()) )
+      ( None (set (uuid continue-iter) false) )
    )))
 );
 

diff --git a/PLATFORM/C/LIB/list.lsts b/PLATFORM/C/LIB/list.lsts
@@ -35,3 +35,13 @@ let .unique(ls: List<x>): List<x> = (
    };
    rs
 );
+
+let .next(ls: Array<List<x>,?>): Maybe<x> = (
+   match open(ls) {
+      [i.. rst] => (
+         ls[0_u64] = rst;
+         Some(i)
+      );
+      [] => (None :: Maybe<x>);
+   };
+);