diff options
Diffstat (limited to 'chapter14/src/main/java')
| -rw-r--r-- | chapter14/src/main/java/com/seaofnodes/simple/node/MinusNode.java | 2 | ||||
| -rw-r--r-- | chapter14/src/main/java/com/seaofnodes/simple/node/NotNode.java | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/chapter14/src/main/java/com/seaofnodes/simple/node/MinusNode.java b/chapter14/src/main/java/com/seaofnodes/simple/node/MinusNode.java index 27b4a478..176d2a3d 100644 --- a/chapter14/src/main/java/com/seaofnodes/simple/node/MinusNode.java +++ b/chapter14/src/main/java/com/seaofnodes/simple/node/MinusNode.java @@ -24,7 +24,7 @@ public class MinusNode extends Node { if( i0 == TypeInteger.BOT || i0._min == Long.MIN_VALUE ) return TypeInteger.BOT; return TypeInteger.make(-i0._max,-i0._min); } - return TypeInteger.TOP.meet(in(1)._type); + return in(1)._type.isHigh() ? TypeInteger.TOP : TypeInteger.BOT; } @Override diff --git a/chapter14/src/main/java/com/seaofnodes/simple/node/NotNode.java b/chapter14/src/main/java/com/seaofnodes/simple/node/NotNode.java index 3ef5d19e..17b6e46e 100644 --- a/chapter14/src/main/java/com/seaofnodes/simple/node/NotNode.java +++ b/chapter14/src/main/java/com/seaofnodes/simple/node/NotNode.java @@ -21,7 +21,8 @@ public class NotNode extends Node { if( t0.isHigh() ) return TypeInteger.BOOL.dual(); switch( t0 ) { case TypeInteger i0: return i0._max < 0 || i0._min > 0 ? TypeInteger.FALSE : (i0==TypeInteger.ZERO ? TypeInteger.TRUE : TypeInteger.BOT); - case TypeFloat i0: return i0.isConstant() ? TypeInteger.constant(i0.value()==0 ? 1 : 0) : i0; + case TypeFloat i0: + return i0.isConstant() ? TypeInteger.constant(i0.value()==0 ? 1 : 0) : TypeInteger.BOT; case TypeMemPtr p0: // top->top, bot->bot, null->1, *void->0, not-null ptr->0, ptr/nil->bot // If input in null then true @@ -34,7 +35,7 @@ public class NotNode extends Node { if( t0.getClass() != Type.class ) // Only doing NOT on ints and ptrs throw Utils.TODO(); - return t0==Type.TOP ? Type.TOP : Type.BOTTOM; + return t0==Type.TOP ? TypeInteger.TOP : TypeInteger.BOT; } } |
