Bugfixes. Add reader & writer memory operations.

Author: dim-s

jphp-core/src/org/develnext/jphp/core/compiler/jvm/statement/ExpressionStmtCompiler.java

@@ -452,8 +452,6 @@ public void writePushMemory(Memory memory) {
             code.add(new MethodInsnNode(INVOKESPECIAL, Type.getInternalName(ReferenceMemory.class), Constants.INIT_METHOD, "()V", false));
         } else if (memory instanceof ArrayMemory) {
             ArrayMemory array = (ArrayMemory) memory;
-
-
             if (!array.isList()) {
                 if (array.size() == 0) {
                     writeSysStaticCall(ArrayMemory.class, "emptyMap", ArrayMemory.class);

jphp-core/src/org/develnext/jphp/core/compiler/jvm/statement/expr/value/StringBuilderValueCompiler.java

@@ -9,6 +9,7 @@
 import org.develnext.jphp.core.tokenizer.token.stmt.ExprStmtToken;
 import php.runtime.Memory;
 import php.runtime.memory.BinaryMemory;
+import php.runtime.memory.StringMemory;
 
 import java.util.List;
 

jphp-runtime/src/php/runtime/memory/support/MemoryOperation.java

@@ -274,6 +274,8 @@ public int hashCode() {
         register(new OutputStreamMemoryOperation());
         register(new FileMemoryOperation());
         register(new ByteArrayInputStreamMemoryOperation());
+        register(new ReaderMemoryStream());
+        register(new WriterMemoryStream());
 
         register(new PatternMemoryOperation());
 

jphp-runtime/src/php/runtime/memory/support/operation/ReaderMemoryStream.java

@@ -1,4 +1,40 @@
 package php.runtime.memory.support.operation;
 
-public class ReaderMemoryStream {
+import php.runtime.Memory;
+import php.runtime.env.Environment;
+import php.runtime.env.TraceInfo;
+import php.runtime.exceptions.CriticalException;
+import php.runtime.ext.core.classes.stream.FileObject;
+import php.runtime.ext.core.classes.stream.Stream;
+import php.runtime.memory.support.MemoryOperation;
+
+import java.io.*;
+
+public class ReaderMemoryStream extends MemoryOperation<Reader> {
+    @Override
+    public Class<?>[] getOperationClasses() {
+        return new Class[] { Reader.class };
+    }
+
+    @Override
+    public Reader convert(Environment env, TraceInfo trace, Memory arg) throws Throwable {
+        if (arg.isNull()) return null;
+
+        if (arg.instanceOf(Stream.class)) {
+            InputStream inputStream = Stream.getInputStream(env, arg);
+            if (inputStream == null) return null;
+
+            return new InputStreamReader(inputStream, env.getDefaultCharset());
+        } else if (arg.instanceOf(FileObject.class)) {
+            Stream stream = Stream.create(env, arg.toString(), "r");
+            return new InputStreamReader(Stream.getInputStream(env, stream), env.getDefaultCharset());
+        }
+
+        return new StringReader(arg.toString());
+    }
+
+    @Override
+    public Memory unconvert(Environment env, TraceInfo trace, Reader arg) throws Throwable {
+        throw new CriticalException("Unsupported operation");
+    }
 }

jphp-runtime/src/php/runtime/memory/support/operation/WriterMemoryStream.java

@@ -10,31 +10,29 @@
 
 import java.io.*;
 
-public class ReaderMemoryStream extends MemoryOperation<Reader> {
+public class WriterMemoryStream extends MemoryOperation<Writer> {
     @Override
     public Class<?>[] getOperationClasses() {
-        return new Class[] { Reader.class };
+        return new Class[] { Writer.class };
     }
 
     @Override
-    public Reader convert(Environment env, TraceInfo trace, Memory arg) throws Throwable {
+    public Writer convert(Environment env, TraceInfo trace, Memory arg) throws Throwable {
         if (arg.isNull()) return null;
 
         if (arg.instanceOf(Stream.class)) {
-            InputStream inputStream = Stream.getInputStream(env, arg);
-            if (inputStream == null) return null;
+            OutputStream outputStream = Stream.getOutputStream(env, arg);
+            if (outputStream == null) return null;
 
-            return new InputStreamReader(inputStream, env.getDefaultCharset());
-        } else if (arg.instanceOf(FileObject.class)) {
-            Stream stream = Stream.create(env, arg.toString(), "r");
-            return new InputStreamReader(Stream.getInputStream(env, stream), env.getDefaultCharset());
+            return new OutputStreamWriter(outputStream, env.getDefaultCharset());
+        } else {
+            Stream stream = Stream.create(env, arg.toString(), "w+");
+            return new OutputStreamWriter(Stream.getOutputStream(env, stream), env.getDefaultCharset());
         }
-
-        return new StringReader(arg.toString());
     }
 
     @Override
-    public Memory unconvert(Environment env, TraceInfo trace, Reader arg) throws Throwable {
+    public Memory unconvert(Environment env, TraceInfo trace, Writer arg) throws Throwable {
         throw new CriticalException("Unsupported operation");
     }
 }

jphp-runtime/src/php/runtime/reflection/CompileMethodEntity.java

@@ -24,6 +24,18 @@
 import java.util.Arrays;
 
 public class CompileMethodEntity extends MethodEntity {
+    public static final InjectMemoryOperation INJECT_ENV_MEMORY_OPERATION = new InjectMemoryOperation() {
+        @Override
+        public Object convert(Environment env, TraceInfo trace, Memory arg) throws Throwable {
+            return env;
+        }
+    };
+    public static final InjectMemoryOperation INJECT_TRACE_MEMORY_OPERATION = new InjectMemoryOperation() {
+        @Override
+        public Object convert(Environment env, TraceInfo trace, Memory arg) throws Throwable {
+            return trace;
+        }
+    };
     protected CompileMethod function;
 
     {
@@ -88,17 +100,17 @@ public boolean addMethod(Method method, boolean skipConflicts, CallbackW<MemoryO
         Class<?>[] parameterTypes = method.getParameterTypes();
         int paramCount = parameterTypes.length;
 
-        for (int x = 0; x < paramCount; x++) {
-        //for (Parameter el : method.getParameters()) { // FIX for Android!
-            Class<?> elType = parameterTypes[x];
+        //for (int x = 0; x < paramCount; x++) {
+        for (Parameter el : method.getParameters()) {
+            Class<?> elType = el.getType();
 
             if (elType == Environment.class || elType == TraceInfo.class) {
                 k++;
                 continue;
             }
 
             ParameterEntity param = new ParameterEntity(context);
-            param.setName(/*el.isNamePresent() ? el.getName() : */"arg" + i); // Fix for Android!
+            param.setName(el.isNamePresent() ? el.getName() : "arg" + i);
             param.setTrace(TraceInfo.UNKNOWN);
 
             Annotation[] argAnnotations = annotations[k];
@@ -379,19 +391,9 @@ public void setParameters(ParameterEntity[] parameters) {
                             k++;
                         } else {
                             if (parameterType == Environment.class) {
-                                argumentOperations[i] = new InjectMemoryOperation() {
-                                    @Override
-                                    public Object convert(Environment env, TraceInfo trace, Memory arg) throws Throwable {
-                                        return env;
-                                    }
-                                };
+                                argumentOperations[i] = INJECT_ENV_MEMORY_OPERATION;
                             } else if (parameterType == TraceInfo.class) {
-                                argumentOperations[i] = new InjectMemoryOperation() {
-                                    @Override
-                                    public Object convert(Environment env, TraceInfo trace, Memory arg) throws Throwable {
-                                        return trace;
-                                    }
-                                };
+                                argumentOperations[i] = INJECT_TRACE_MEMORY_OPERATION;
                             } else {
                                 if (unknownTypeFetcher != null) {
                                     op = unknownTypeFetcher.call(parameterType, genericTypes);