From fb80ada35ce2806c2f617a0e336d2ca4ab1d5d12 Mon Sep 17 00:00:00 2001 From: Cliff Click Date: Tue, 22 Sep 2026 15:50:22 -0700 Subject: Graph cleanup Phis stay with regions, stop sinks to bottom, --- chapter07/src/main/java/com/seaofnodes/simple/Parser.java | 2 +- .../src/main/java/com/seaofnodes/simple/print/SimpleGraphAdapter.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'chapter07/src/main') diff --git a/chapter07/src/main/java/com/seaofnodes/simple/Parser.java b/chapter07/src/main/java/com/seaofnodes/simple/Parser.java index f40eb3a3..2e043538 100644 --- a/chapter07/src/main/java/com/seaofnodes/simple/Parser.java +++ b/chapter07/src/main/java/com/seaofnodes/simple/Parser.java @@ -237,6 +237,7 @@ public class Parser { // But first clone the scope and set it as current int ndefs = _scope.nIns(); ScopeNode fScope = _scope.dup(); // Duplicate current scope + fScope.ctrl(ifF); // The pending arm already starts at False _xScopes.push(fScope); // For graph visualization we need all scopes // Parse the true side @@ -246,7 +247,6 @@ public class Parser { // Parse the false side _scope = fScope; // Restore scope, then parse else block if any - ctrl(ifF); // Ctrl token is now set to ifFalse projection if (matchx("else")) { parseStatement(); fScope = _scope; diff --git a/chapter07/src/main/java/com/seaofnodes/simple/print/SimpleGraphAdapter.java b/chapter07/src/main/java/com/seaofnodes/simple/print/SimpleGraphAdapter.java index e907e744..9f33520e 100644 --- a/chapter07/src/main/java/com/seaofnodes/simple/print/SimpleGraphAdapter.java +++ b/chapter07/src/main/java/com/seaofnodes/simple/print/SimpleGraphAdapter.java @@ -34,6 +34,7 @@ public class SimpleGraphAdapter extends GraphAdapter { } private Kind kind(Node n) { + if( n instanceof StopNode ) return Kind.STOP; if( n instanceof ScopeNode ) return Kind.SCOPE; if( n instanceof StartNode ) return Kind.CTRL; if( n instanceof LoopNode ) return Kind.LOOP; -- cgit v1.2.3