From d2df2a776bf2bd2d382de948d1ad83e54eb38ffc Mon Sep 17 00:00:00 2001
From: Cliff Click <cliffc@acm.org>
Date: Wed, 4 Dec 2024 09:04:36 -0800
Subject: Fix HTML printing

---
 chapter18/src/main/java/com/seaofnodes/simple/JSViewer.java      | 5 ++---
 chapter18/src/main/java/com/seaofnodes/simple/node/BoolNode.java | 2 ++
 chapter18/src/main/java/com/seaofnodes/simple/node/SarNode.java  | 2 +-
 chapter18/src/main/java/com/seaofnodes/simple/node/ShlNode.java  | 2 +-
 chapter18/src/main/java/com/seaofnodes/simple/node/ShrNode.java  | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'chapter18/src')

diff --git a/chapter18/src/main/java/com/seaofnodes/simple/JSViewer.java b/chapter18/src/main/java/com/seaofnodes/simple/JSViewer.java
index c63b5118..15174085 100644
--- a/chapter18/src/main/java/com/seaofnodes/simple/JSViewer.java
+++ b/chapter18/src/main/java/com/seaofnodes/simple/JSViewer.java
@@ -312,7 +312,7 @@ public class JSViewer implements AutoCloseable {
 
             // Bonus edge if hooked by parser
             if( (n.iskeep() || n.isUnused()) && scopeName != null ) {
-                sb.i().p(scopeName).p(" -> ").p(n.uniqueName()).p(" [ style=dashed color=grey]\n");
+                sb.i().p(scopeName).p(" -> ").p(n.uniqueName()).p(" [ style=dashed color=grey];\n");
             }
         }
     }
@@ -355,8 +355,7 @@ public class JSViewer implements AutoCloseable {
             for( int i=2; i<n.nIns(); i++ ) {
                 Node def = n.in(i);
                 while( def instanceof ScopeNode lazy )
-                    //def = lazy.in(v._idx);
-                    throw Utils.TODO();
+                    def = lazy.in(i);
                 if( def==null ) continue;
                 String scopeName = makeScopeName(scope, 0);
                 sb.i().p(scopeName).p(":m").p(i).p(" -> ");
diff --git a/chapter18/src/main/java/com/seaofnodes/simple/node/BoolNode.java b/chapter18/src/main/java/com/seaofnodes/simple/node/BoolNode.java
index 238be00e..7126806d 100644
--- a/chapter18/src/main/java/com/seaofnodes/simple/node/BoolNode.java
+++ b/chapter18/src/main/java/com/seaofnodes/simple/node/BoolNode.java
@@ -93,6 +93,7 @@ abstract public class BoolNode extends Node {
     public static class LT extends BoolNode {
         public LT(Node lhs, Node rhs) { super(lhs,rhs); }
         String op() { return "<" ; }
+        public String glabel() { return "&lt;"; }
         TypeInteger doOp(TypeInteger i1, TypeInteger i2) {
             if( i1._max <  i2._min ) return TRUE;
             if( i1._min >= i2._max ) return FALSE;
@@ -104,6 +105,7 @@ abstract public class BoolNode extends Node {
     public static class LE extends BoolNode {
         public LE(Node lhs, Node rhs) { super(lhs,rhs); }
         String op() { return "<="; }
+        public String glabel() { return "&lt;="; }
         TypeInteger doOp(TypeInteger i1, TypeInteger i2) {
             if( i1._max <= i2._min ) return TRUE;
             if( i1._min >  i2._max ) return FALSE;
diff --git a/chapter18/src/main/java/com/seaofnodes/simple/node/SarNode.java b/chapter18/src/main/java/com/seaofnodes/simple/node/SarNode.java
index 5dc26ad3..59cec99c 100644
--- a/chapter18/src/main/java/com/seaofnodes/simple/node/SarNode.java
+++ b/chapter18/src/main/java/com/seaofnodes/simple/node/SarNode.java
@@ -10,7 +10,7 @@ public class SarNode extends Node {
 
     @Override public String label() { return "Sar"; }
 
-    @Override public String glabel() { return ">>"; }
+    @Override public String glabel() { return "&gt;&gt;"; }
 
     @Override
     StringBuilder _print1(StringBuilder sb, BitSet visited) {
diff --git a/chapter18/src/main/java/com/seaofnodes/simple/node/ShlNode.java b/chapter18/src/main/java/com/seaofnodes/simple/node/ShlNode.java
index 6fd951e4..e167fd68 100644
--- a/chapter18/src/main/java/com/seaofnodes/simple/node/ShlNode.java
+++ b/chapter18/src/main/java/com/seaofnodes/simple/node/ShlNode.java
@@ -10,7 +10,7 @@ public class ShlNode extends Node {
 
     @Override public String label() { return "Shl"; }
 
-    @Override public String glabel() { return "<<"; }
+    @Override public String glabel() { return "&lt;&lt;"; }
 
     @Override
     StringBuilder _print1(StringBuilder sb, BitSet visited) {
diff --git a/chapter18/src/main/java/com/seaofnodes/simple/node/ShrNode.java b/chapter18/src/main/java/com/seaofnodes/simple/node/ShrNode.java
index 22eb45a0..b8c226bd 100644
--- a/chapter18/src/main/java/com/seaofnodes/simple/node/ShrNode.java
+++ b/chapter18/src/main/java/com/seaofnodes/simple/node/ShrNode.java
@@ -10,7 +10,7 @@ public class ShrNode extends Node {
 
     @Override public String label() { return "Shr"; }
 
-    @Override public String glabel() { return ">>>"; }
+    @Override public String glabel() { return "&gt;&gt;&gt;"; }
 
     @Override
     StringBuilder _print1(StringBuilder sb, BitSet visited) {
-- 
cgit v1.2.3