Merge pull request #18 from PetrPytelka/string_fix_mid_function

String fix mid function

Author: verhas

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

@@ -1,6 +1,7 @@
 package com.scriptbasic.utility.functions;
 
 import com.scriptbasic.api.BasicFunction;
+import com.scriptbasic.interfaces.BasicRuntimeException;
 
 /**
  * <p>
@@ -72,6 +73,20 @@ static public String rtrim(final String s) {
         return s.replaceAll("\\s*$", "");
     }
 
+    /**
+     * Return {@code len} number of characters from the left (the beginning) of the
+     * string.
+     *
+     * @param s   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) {
+        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}.
@@ -80,11 +95,15 @@ static public String rtrim(final String s) {
      * @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) {
-        return s.substring(start, start + len);
+    static public String mid(final String s, final int start, final int len) throws BasicRuntimeException {
+        if (start < 1) {
+            throw new BasicRuntimeException("Incorrect value in parameter start: " + start);
+        }
+        return s.substring(start - 1, start - 1 + len);
     }
 
     /**

src/test/java/com/scriptbasic/testprograms/TestPrograms.java

@@ -160,6 +160,11 @@ public void testStringConcatenation() throws Exception {
         codeTest("TestStringConcatenation.bas", "");
     }
 
+    @Test
+    public void testStringFunctions() throws Exception {
+        codeTest("TestStringFunctions.bas", "0189123");
+    }
+    
     @Test
     public void testJavaObjectFieldAccess() throws ScriptBasicException, ClassNotFoundException, AnalysisException {
         final var e = new TestingExecutor();

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

@@ -0,0 +1,4 @@
+v = "0123456789"
+PRINT left(v,2)
+PRINT right(v,2)
+PRINT mid(v,2,3)