Clean up memory classes.

Author: dim-s

jphp-runtime/src/php/runtime/Memory.java

@@ -252,8 +252,8 @@ public int getPointer(){
     public boolean isObject() { return type == Type.OBJECT; }
     public boolean isClosure() { return false; }
     public boolean isResource() { return false; }
-    public boolean isArray(){ return type == Type.ARRAY; }
-    public boolean isTraversable() { return isArray() || instanceOf("Traversable", "traversable"); }
+    public boolean isArray() { return type == Type.ARRAY; }
+    public boolean isTraversable() { return isArray() || (isObject() && instanceOf("Traversable", "traversable")); }
     public boolean isString() { return type == Type.STRING; }
     public boolean isNumber() { return type == Type.INT || type == Type.DOUBLE; }
     public boolean isBoolean() { return type == Type.BOOL; }

jphp-runtime/src/php/runtime/memory/DoubleMemory.java

@@ -337,59 +337,4 @@ public int hashCode() {
     public byte[] getBinaryBytes(Charset charset) {
         return MemoryStringUtils.getBinaryBytes(this);
     }
-
-    @Override
-    public boolean isArray() {
-        return false;
-    }
-
-    @Override
-    public Memory toValue() {
-        return this;
-    }
-
-    @Override
-    public Memory toImmutable() {
-        return this;
-    }
-
-    @Override
-    public boolean isNull() {
-        return false;
-    }
-
-    @Override
-    public boolean isUndefined() {
-        return false;
-    }
-
-    @Override
-    public boolean isString() {
-        return false;
-    }
-
-    @Override
-    public boolean isTraversable() {
-        return false;
-    }
-
-    @Override
-    public boolean isReference() {
-        return false;
-    }
-
-    @Override
-    public boolean isObject() {
-        return false;
-    }
-
-    @Override
-    public boolean isClosure() {
-        return false;
-    }
-
-    @Override
-    public boolean isNumber() {
-        return true;
-    }
 }

jphp-runtime/src/php/runtime/memory/FalseMemory.java

@@ -283,24 +283,4 @@ public boolean identical(String value) {
     public Invoker toInvoker(Environment env) {
         return null;
     }
-
-    @Override
-    public boolean isArray() {
-        return false;
-    }
-
-    @Override
-    public Memory toValue() {
-        return this;
-    }
-
-    @Override
-    public Memory toImmutable() {
-        return this;
-    }
-
-    @Override
-    public boolean isNumber() {
-        return false;
-    }
 }

jphp-runtime/src/php/runtime/memory/LongMemory.java

@@ -305,63 +305,8 @@ public byte[] getBinaryBytes(Charset charset) {
         return MemoryStringUtils.getBinaryBytes(this);
     }
 
-    @Override
-    public boolean isNull() {
-        return false;
-    }
-
     @Override
     public boolean isNotNull() {
         return true;
     }
-
-    @Override
-    public boolean isArray() {
-        return false;
-    }
-
-    @Override
-    public Memory toValue() {
-        return this;
-    }
-
-    @Override
-    public Memory toImmutable() {
-        return this;
-    }
-
-    @Override
-    public boolean isUndefined() {
-        return false;
-    }
-
-    @Override
-    public boolean isString() {
-        return false;
-    }
-
-    @Override
-    public boolean isTraversable() {
-        return false;
-    }
-
-    @Override
-    public boolean isReference() {
-        return false;
-    }
-
-    @Override
-    public boolean isObject() {
-        return false;
-    }
-
-    @Override
-    public boolean isClosure() {
-        return false;
-    }
-
-    @Override
-    public boolean isNumber() {
-        return true;
-    }
 }

jphp-runtime/src/php/runtime/memory/NativeMemory.java

@@ -13,14 +13,4 @@ public NativeMemory(T object) {
     public T getObject() {
         return object;
     }
-
-    @Override
-    public Memory toImmutable() {
-        return this;
-    }
-
-    @Override
-    public Memory toValue() {
-        return this;
-    }
 }

jphp-runtime/src/php/runtime/memory/ObjectMemory.java

@@ -1259,39 +1259,4 @@ public boolean equals(Object o) {
 
         return value != null ? value.equals(that.value) : that.value == null;
     }
-
-    @Override
-    public Memory toValue() {
-        return this;
-    }
-
-    @Override
-    public Memory toImmutable() {
-        return this;
-    }
-
-    @Override
-    public boolean isNull() {
-        return false;
-    }
-
-    @Override
-    public boolean isUndefined() {
-        return false;
-    }
-
-    @Override
-    public boolean isString() {
-        return false;
-    }
-
-    @Override
-    public boolean isReference() {
-        return false;
-    }
-
-    @Override
-    public boolean isNumber() {
-        return false;
-    }
 }

jphp-runtime/src/php/runtime/memory/StringMemory.java

@@ -674,61 +674,6 @@ public int hashCode() {
         return toString() == null ? 0 : toString().hashCode();
     }
 
-    @Override
-    public boolean isArray() {
-        return false;
-    }
-
-    @Override
-    public Memory toValue() {
-        return this;
-    }
-
-    @Override
-    public Memory toImmutable() {
-        return this;
-    }
-
-    @Override
-    public boolean isNull() {
-        return false;
-    }
-
-    @Override
-    public boolean isUndefined() {
-        return false;
-    }
-
-    @Override
-    public boolean isString() {
-        return true;
-    }
-
-    @Override
-    public boolean isTraversable() {
-        return false;
-    }
-
-    @Override
-    public boolean isReference() {
-        return false;
-    }
-
-    @Override
-    public boolean isObject() {
-        return false;
-    }
-
-    @Override
-    public boolean isClosure() {
-        return false;
-    }
-
-    @Override
-    public boolean isNumber() {
-        return false;
-    }
-
     protected static StringMemory getChar(char ch) {
         int i = (int) ch;
 

jphp-runtime/src/php/runtime/memory/TrueMemory.java

@@ -285,60 +285,4 @@ public boolean identical(boolean value) {
     public boolean identical(String value) {
         return false;
     }
-
-    @Override
-    public boolean isArray() {
-        return false;
-    }
-
-    @Override
-    public Memory toValue() {
-        return this;
-    }
-
-    @Override
-    public Memory toImmutable() {
-        return this;
-    }
-
-
-    @Override
-    public boolean isNull() {
-        return false;
-    }
-
-    @Override
-    public boolean isUndefined() {
-        return false;
-    }
-
-    @Override
-    public boolean isString() {
-        return false;
-    }
-
-    @Override
-    public boolean isTraversable() {
-        return false;
-    }
-
-    @Override
-    public boolean isReference() {
-        return false;
-    }
-
-    @Override
-    public boolean isObject() {
-        return false;
-    }
-
-    @Override
-    public boolean isClosure() {
-        return false;
-    }
-
-    @Override
-    public boolean isNumber() {
-        return false;
-    }
 }

jphp-runtime/src/php/runtime/memory/helper/ClassConstantMemory.java

@@ -48,9 +48,4 @@ public String getName() {
     public String getClassName() {
         return className;
     }
-
-    @Override
-    public Memory toValue() {
-        return this;
-    }
 }

jphp-runtime/src/php/runtime/memory/helper/UndefinedMemory.java

@@ -11,9 +11,4 @@ public class UndefinedMemory extends NullMemory {
     public Memory toImmutable() {
         return UNDEFINED;
     }
-
-    @Override
-    public boolean isUndefined() {
-        return true;
-    }
 }