From b475b072b38db7f46406ed6128fffe3e15a6e7ac Mon Sep 17 00:00:00 2001 From: Cliff Click Date: Tue, 29 Sep 2026 13:08:30 -0700 Subject: forward port lazy memory to ch11 --- chapter10b/src/test/java/com/seaofnodes/simple/Chapter04Test.java | 3 +++ .../src/test/java/com/seaofnodes/simple/evaluator/Evaluator.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'chapter10b/src/test') diff --git a/chapter10b/src/test/java/com/seaofnodes/simple/Chapter04Test.java b/chapter10b/src/test/java/com/seaofnodes/simple/Chapter04Test.java index f1603cc4..edc62f50 100644 --- a/chapter10b/src/test/java/com/seaofnodes/simple/Chapter04Test.java +++ b/chapter10b/src/test/java/com/seaofnodes/simple/Chapter04Test.java @@ -85,6 +85,9 @@ public class Chapter04Test { ReturnNode ret = stop.ret(); assertTrue(ret.in(0) instanceof ProjNode); assertTrue(ret.in(1) instanceof ProjNode); + assertEquals(1, ((ProjNode)ret.in(1))._idx); + assertTrue(ret.in(2) instanceof ProjNode); + assertEquals(2, ((ProjNode)ret.in(2))._idx); } @Test diff --git a/chapter10b/src/test/java/com/seaofnodes/simple/evaluator/Evaluator.java b/chapter10b/src/test/java/com/seaofnodes/simple/evaluator/Evaluator.java index e49e0303..ac7c5e09 100644 --- a/chapter10b/src/test/java/com/seaofnodes/simple/evaluator/Evaluator.java +++ b/chapter10b/src/test/java/com/seaofnodes/simple/evaluator/Evaluator.java @@ -163,7 +163,7 @@ public class Evaluator { case null: return Status.FALLTHROUGH; case ReturnNode ret: - return val(ret.in(1)); + return val(ret.expr()); case IfNode ifn: block = block.next()[isTrue(val(ifn.in(1))) ? 0 : 1]; if (block == null) return Status.FALLTHROUGH; -- cgit v1.2.3