Skip to content

Commit 78b19a2

Browse files
Merge pull request #210 from andrew-johnson-4/strict-s-expressions-1
Strict s expressions 1
2 parents 1de3251 + 2f3489e commit 78b19a2

File tree

3 files changed

+15
-12
lines changed

3 files changed

+15
-12
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "lambda_mountain"
3-
version = "1.11.72"
3+
version = "1.11.73"
44
authors = ["Andrew <andrew@subarctic.org>"]
55
license = "MIT"
66
description = "Lambda Mountain"

STDLIB/default-stdlib.lm

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,10 @@ print := λ(: x S). (: (tail(
2020
(if (==( (.0 x) 1u64 )) (tail(
2121
(let c SNil)
2222
(print '\[_s)
23-
(print( (as (.1 (as x SCons)) U64) ))
24-
(mov( (.1 (as x SCons)) 0u64 c ))
23+
(mov( (.2 (as x SCons)) 0u64 c ))
2524
(print c)
2625
(print '\s_s)
27-
(print( (as (.2 (as x SCons)) U64) ))
28-
(mov( (.2 (as x SCons)) 0u64 c ))
26+
(mov( (.1 (as x SCons)) 0u64 c ))
2927
(print c)
3028
(print '\]_s)
3129
()

tests/strict/cc2.lm

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,16 @@ echo := λ(: x U64). (: (
88
x
99
) U64);
1010

11-
main := (
12-
(let x SNil)
13-
# (let x (SCons(
14-
# (close(SAtom( 'an-atom_s )))
15-
# (close(SNil))
16-
# )))
11+
main := (tail(
12+
(let l1 (SAtom( 'an-atom_s )))
13+
(let l2 (close l1))
14+
(let r1 (SNil))
15+
(let r2 (close r1))
16+
(let x (SCons( l2 r2 )))
1717
(print x)
18-
);
18+
()
19+
# (print (SCons(
20+
# (SAtom( 'an-atom_s ))
21+
# (SNil)
22+
# )))
23+
));

0 commit comments

Comments
 (0)