Merge pull request #210 from andrew-johnson-4/strict-s-expressions-1

Strict s expressions 1

Author: andrew-johnson-4

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "lambda_mountain"
-version = "1.11.72"
+version = "1.11.73"
 authors = ["Andrew <andrew@subarctic.org>"]
 license = "MIT"
 description = "Lambda Mountain"

STDLIB/default-stdlib.lm

@@ -20,12 +20,10 @@ print := λ(: x S). (: (tail(
          (if (==( (.0 x) 1u64 )) (tail(
             (let c SNil)
             (print '\[_s)
-            (print( (as (.1 (as x SCons)) U64) ))
-            (mov( (.1 (as x SCons)) 0u64 c ))
+            (mov( (.2 (as x SCons)) 0u64 c ))
             (print c)
             (print '\s_s)
-            (print( (as (.2 (as x SCons)) U64) ))
-            (mov( (.2 (as x SCons)) 0u64 c ))
+            (mov( (.1 (as x SCons)) 0u64 c ))
             (print c)
             (print '\]_s)
             ()

tests/strict/cc2.lm

@@ -8,11 +8,16 @@ echo := λ(: x U64). (: (
    x
 ) U64);
 
-main := (
-   (let x SNil)
-#   (let x (SCons(
-#      (close(SAtom( 'an-atom_s )))
-#      (close(SNil))
-#   )))
+main := (tail(
+   (let l1 (SAtom( 'an-atom_s )))
+   (let l2 (close l1))
+   (let r1 (SNil))
+   (let r2 (close r1))
+   (let x (SCons( l2 r2 )))
    (print x)
-);
+   ()
+#   (print (SCons(
+#      (SAtom( 'an-atom_s ))
+#      (SNil)
+#   )))
+));