[std] Add parseDouble, nanotime, exit, getenv, getprop

Author: aNNiMON

modules/main/src/main/java/com/annimon/ownlang/modules/std/ArrayFunctions.java

@@ -10,7 +10,7 @@
 import com.annimon.ownlang.lib.ValueUtils;
 import java.io.UnsupportedEncodingException;
 
-public final class ArrayFunctions {
+final class ArrayFunctions {
 
     private ArrayFunctions() { }
 

modules/main/src/main/java/com/annimon/ownlang/modules/std/NumberFunctions.java

@@ -6,7 +6,7 @@
 import com.annimon.ownlang.lib.Types;
 import com.annimon.ownlang.lib.Value;
 
-public final class NumberFunctions {
+final class NumberFunctions {
 
     private NumberFunctions() { }
 

modules/main/src/main/java/com/annimon/ownlang/modules/std/StringFunctions.java

@@ -8,7 +8,7 @@
 import com.annimon.ownlang.lib.Value;
 import java.io.UnsupportedEncodingException;
 
-public final class StringFunctions {
+final class StringFunctions {
 
     private StringFunctions() { }
 
@@ -21,6 +21,11 @@ static ArrayValue getBytes(Value[] args) {
             throw new OwnLangRuntimeException(uee);
         }
     }
+
+    static Value parseDouble(Value[] args) {
+        Arguments.check(1, args.length);
+        return NumberValue.of(Double.parseDouble(args[0].asString()));
+    }
 
     static Value parseInt(Value[] args) {
         Arguments.checkOrOr(1, 2, args.length);
@@ -45,7 +50,7 @@ static Value stripMargin(Value[] args) {
 
         // First blank line is omitted
         final StringBuilder sb = new StringBuilder();
-        final int firstLineIndex = (isBlank(lines[0])) ? 1 : 0;
+        final int firstLineIndex = (lines[0].isBlank()) ? 1 : 0;
         final int lastLineIndex = lines.length - 1;
         int index = firstLineIndex;
         while (true) {
@@ -54,7 +59,7 @@ static Value stripMargin(Value[] args) {
             sb.append('\n');
         }
         // Process last line
-        if (lastLineIndex >= (firstLineIndex + 1) && !isBlank(lines[lastLineIndex])) {
+        if (lastLineIndex >= (firstLineIndex + 1) && !lines[lastLineIndex].isBlank()) {
             sb.append('\n').append(strip(lines[lastLineIndex], marginPrefix));
         }
         return new StringValue(sb.toString());
@@ -68,10 +73,6 @@ private static String strip(String str, String marginPrefix) {
             return str;
         }
     }
-
-    private static boolean isBlank(String str) {
-        return firstNonBlankIndex(str) == str.length();
-    }
 
     private static int firstNonBlankIndex(String str) {
         final int length = str.length();

modules/main/src/main/java/com/annimon/ownlang/modules/std/SystemFunctions.java

@@ -0,0 +1,42 @@
+package com.annimon.ownlang.modules.std;
+
+import com.annimon.ownlang.lib.*;
+
+final class SystemFunctions {
+
+    private SystemFunctions() { }
+
+    static Value exit(Value[] args) {
+        Arguments.check(1, args.length);
+        System.exit(args[0].asInt());
+        return NumberValue.ZERO;
+    }
+
+    static Value getenv(Value[] args) {
+        Arguments.checkOrOr(1, 2, args.length);
+        final var env = System.getenv(args[0].asString());
+        if (env == null) {
+            return args.length == 2 ? args[1] : StringValue.EMPTY;
+        }
+        return new StringValue(env);
+    }
+
+    static Value getprop(Value[] args) {
+        Arguments.checkOrOr(1, 2, args.length);
+        final var env = System.getProperty(args[0].asString());
+        if (env == null) {
+            return args.length == 2 ? args[1] : StringValue.EMPTY;
+        }
+        return new StringValue(env);
+    }
+
+    static Value time(Value[] args) {
+        Arguments.check(0, args.length);
+        return NumberValue.of(System.currentTimeMillis());
+    }
+
+    static Value nanotime(Value[] args) {
+        Arguments.check(0, args.length);
+        return NumberValue.of(System.nanoTime());
+    }
+}

modules/main/src/main/java/com/annimon/ownlang/modules/std/std.java

@@ -4,6 +4,7 @@
 import com.annimon.ownlang.Version;
 import com.annimon.ownlang.lib.*;
 import com.annimon.ownlang.modules.Module;
+import java.util.HashMap;
 import java.util.Map;
 import static java.util.Map.entry;
 
@@ -30,22 +31,31 @@ public Map<String, Value> constants() {
 
     @Override
     public Map<String, Function> functions() {
-        return Map.ofEntries(
+        // std, System
+        final var result = new HashMap<>(Map.ofEntries(
                 entry("echo", new std_echo()),
                 entry("readln", new std_readln()),
                 entry("length", new std_length()),
                 entry("rand", new std_rand()),
-                entry("time", new std_time()),
+                entry("time", SystemFunctions::time),
+                entry("nanotime", SystemFunctions::nanotime),
                 entry("sleep", new std_sleep()),
                 entry("thread", new std_thread()),
                 entry("sync", new std_sync()),
                 entry("try", new std_try()),
                 entry("default", new std_default()),
+                entry("exit", SystemFunctions::exit),
+                entry("getenv", SystemFunctions::getenv),
+                entry("getprop", SystemFunctions::getprop)
+        ));
 
-                // Numbers
-                entry("toHexString", NumberFunctions::toHexString),
+        // Numbers
+        result.putAll(Map.ofEntries(
+                entry("toHexString", NumberFunctions::toHexString)
+        ));
 
-                // String
+        // String
+        result.putAll(Map.ofEntries(
                 entry("getBytes", StringFunctions::getBytes),
                 entry("sprintf", new std_sprintf()),
                 entry("split", new std_split()),
@@ -62,9 +72,12 @@ public Map<String, Function> functions() {
                 entry("replaceFirst", new std_replacefirst()),
                 entry("parseInt", StringFunctions::parseInt),
                 entry("parseLong", StringFunctions::parseLong),
-                entry("stripMargin", StringFunctions::stripMargin),
+                entry("parseDouble", StringFunctions::parseDouble),
+                entry("stripMargin", StringFunctions::stripMargin)
+        ));
 
-                // Arrays and map,
+        // Arrays and map
+        result.putAll(Map.ofEntries(
                 entry("newarray", new std_newarray()),
                 entry("join", new std_join()),
                 entry("sort", new std_sort()),
@@ -75,6 +88,7 @@ public Map<String, Function> functions() {
                 entry("arraySplice", new std_arraySplice()),
                 entry("range", new std_range()),
                 entry("stringFromBytes", ArrayFunctions::stringFromBytes)
-        );
+        ));
+        return Map.copyOf(result);
     }
 }

modules/main/src/main/java/com/annimon/ownlang/modules/std/std_arrayCombine.java

@@ -8,7 +8,7 @@
 import com.annimon.ownlang.lib.Types;
 import com.annimon.ownlang.lib.Value;
 
-public final class std_arrayCombine implements Function {
+final class std_arrayCombine implements Function {
 
     @Override
     public Value execute(Value[] args) {

modules/main/src/main/java/com/annimon/ownlang/modules/std/std_arrayKeyExists.java

@@ -8,7 +8,7 @@
 import com.annimon.ownlang.lib.Types;
 import com.annimon.ownlang.lib.Value;
 
-public final class std_arrayKeyExists implements Function {
+final class std_arrayKeyExists implements Function {
 
     @Override
     public Value execute(Value[] args) {

modules/main/src/main/java/com/annimon/ownlang/modules/std/std_arrayKeys.java

@@ -11,7 +11,7 @@
 import java.util.List;
 import java.util.Map;
 
-public final class std_arrayKeys implements Function {
+final class std_arrayKeys implements Function {
 
     @Override
     public Value execute(Value[] args) {

modules/main/src/main/java/com/annimon/ownlang/modules/std/std_arraySplice.java

@@ -7,7 +7,7 @@
 import com.annimon.ownlang.lib.Types;
 import com.annimon.ownlang.lib.Value;
 
-public final class std_arraySplice implements Function {
+final class std_arraySplice implements Function {
 
     @Override
     public Value execute(Value[] args) {

modules/main/src/main/java/com/annimon/ownlang/modules/std/std_arrayValues.java

@@ -11,7 +11,7 @@
 import java.util.List;
 import java.util.Map;
 
-public final class std_arrayValues implements Function {
+final class std_arrayValues implements Function {
 
     @Override
     public Value execute(Value[] args) {