String functions (trim, left, right, mid) - supports null parameter and numerical parameter, improved VB compatibility

Author: PetrPytelka

src/main/java/com/scriptbasic/utility/functions/StringFunctions.java

@@ -57,8 +57,11 @@ static public String chomp(final String s) {
      */
     @BasicFunction(classification = {com.scriptbasic.classification.String.class,
             com.scriptbasic.classification.Utility.class})
-    static public String ltrim(final String s) {
-        return s.replaceAll("^\\s*", "");
+    static public String ltrim(final Object s) {
+        if(s==null) {
+            return null;
+        }
+        return s.toString().replaceAll("^\\s*", "");
     }
 
     /**
@@ -69,54 +72,69 @@ static public String ltrim(final String s) {
      */
     @BasicFunction(classification = {com.scriptbasic.classification.String.class,
             com.scriptbasic.classification.Utility.class})
-    static public String rtrim(final String s) {
-        return s.replaceAll("\\s*$", "");
+    static public String rtrim(final Object s) {
+        if(s==null) {
+            return null;
+        }
+        return s.toString().replaceAll("\\s*$", "");
     }
 
     /**
      * Return {@code len} number of characters from the left (the beginning) of the
      * string.
      *
-     * @param s   parameter
+     * @param o   parameter
      * @param len parameter
      * @return return value
      */
     @BasicFunction(classification = {com.scriptbasic.classification.String.class,
             com.scriptbasic.classification.Utility.class})
-    static public String left(final String s, final int len) {
+    static public String left(final Object o, final int len) {
+        if(o==null) {
+            return null;
+        }
+        String s = o.toString();
         return s.length() > len ? s.substring(0, len) : s;
     }
 
     /**
      * Return a substring from the string that starts at the position
      * {@code start} and has a length of {@code len}.
      *
-     * @param s     parameter
+     * @param o     parameter
      * @param start parameter
      * @param len   parameter
      * @return return value
      * @throws BasicRuntimeException incorrect parameter
      */
     @BasicFunction(classification = {com.scriptbasic.classification.String.class,
             com.scriptbasic.classification.Utility.class})
-    static public String mid(final String s, final int start, final int len) throws BasicRuntimeException {
+    static public String mid(final Object o, final int start, final int len) throws BasicRuntimeException {
         if (start < 1) {
             throw new BasicRuntimeException("Incorrect value in parameter start: " + start);
         }
+        if(o==null) {
+            return null;
+        }
+        String s = o.toString();
         return s.substring(start - 1, start - 1 + len);
     }
 
     /**
      * Return {@code len} number of characters from the right (the end) of the
      * string.
      *
-     * @param s   parameter
+     * @param o   parameter
      * @param len parameter
      * @return return value
      */
     @BasicFunction(classification = {com.scriptbasic.classification.String.class,
             com.scriptbasic.classification.Utility.class})
-    static public String right(final String s, final int len) {
+    static public String right(final Object o, final int len) {
+        if(o==null) {
+            return null;
+        }
+        String s = o.toString();
         return s.length() > len ? s.substring(s.length() - len) : s;
     }
 
@@ -185,8 +203,11 @@ static public String lcase(final String s) {
     }
 
     @BasicFunction(classification = {com.scriptbasic.classification.String.class})
-    static public String trim(final String s) {
-        return s.trim();
+    static public String trim(final Object s) {
+        if(s==null) {
+            return null;
+        }
+        return s.toString().trim();
     }
 
     /**

src/test/resources/com/scriptbasic/testprograms/TestStringFunctions.bas

@@ -1,3 +1,19 @@
+' Test ltrim, trim, rtrim functions
+v = 1234
+assert("ltrim_with_num", ltrim(v)="1234")
+assert("trim_with_num", trim(v)="1234")
+assert("rtrim_with_num", rtrim(v)="1234")
+
+v = " 1234 "
+assert("ltrim", ltrim(v)="1234 ")
+assert("trim", trim(v)="1234")
+assert("rtrim", rtrim(v)=" 1234")
+
+' Test left, mid, right functions
+v = 1234
+assert("left_with_num", left(v,2)="12")
+assert("mid_with_num", mid(v,2,3)="234")
+assert("right_with_num", right(v,2)="34")
 v = "0123456789"
 PRINT left(v,2)
 PRINT RIGHT(v,2)