Методы для создания ArrayValue из массива байт и строк

Author: aNNiMON

src/com/annimon/ownlang/lib/ArrayValue.java

@@ -10,6 +10,24 @@
  * @author aNNiMON
  */
 public final class ArrayValue implements Value, Iterable<Value> {
+
+    public static ArrayValue of(byte[] array) {
+        final int size = array.length;
+        final ArrayValue result = new ArrayValue(size);
+        for (int i = 0; i < size; i++) {
+            result.set(i, NumberValue.of(array[i]));
+        }
+        return result;
+    }
+
+    public static ArrayValue of(String[] array) {
+        final int size = array.length;
+        final ArrayValue result = new ArrayValue(size);
+        for (int i = 0; i < size; i++) {
+            result.set(i, new StringValue(array[i]));
+        }
+        return result;
+    }
 
     public static ArrayValue add(ArrayValue array, Value value) {
         final int last = array.elements.length;

src/com/annimon/ownlang/lib/modules/files.java

@@ -10,7 +10,6 @@
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.FilenameFilter;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
@@ -124,13 +123,7 @@ public Value execute(Value... args) {
     private static class listFiles extends FileFunction {
         @Override
         protected Value execute(FileInfo fileInfo, Value[] args) throws IOException {
-            final String[] files = fileInfo.file.list();
-            final int size = files.length;
-            final ArrayValue result = new ArrayValue(size);
-            for (int i = 0; i < size; i++) {
-                result.set(i, new StringValue(files[i]));
-            }
-            return result;
+            return ArrayValue.of(fileInfo.file.list());
         }
     }
 
@@ -221,13 +214,7 @@ protected Value execute(FileInfo fileInfo, Value[] args) throws IOException {
             }
             baos.flush();
             baos.close();
-            final byte[] bytes = baos.toByteArray();
-            final int size = bytes.length;
-            final ArrayValue result = new ArrayValue(size);
-            for (int i = 0; i < size; i++) {
-                result.set(i, NumberValue.of(bytes[i]));
-            }
-            return result;
+            return ArrayValue.of(baos.toByteArray());
         }
     }
 

src/com/annimon/ownlang/lib/modules/functions/std_split.java

@@ -13,11 +13,6 @@ public Value execute(Value... args) {
         final int limit = (args.length == 3) ? args[2].asInt() : 0;
 
         final String[] parts = input.split(regex, limit);
-        final ArrayValue result = new ArrayValue(parts.length);
-        for (int i = 0; i < parts.length; i++) {
-            result.set(i, new StringValue(parts[i]));
-        }
-
-        return result;
+        return ArrayValue.of(parts);
     }
 }