executor test code uses stack walker instead of stack trace

deprecated API is deleted from ScriptBasic

Author: verhas

pom.xml

@@ -155,7 +155,6 @@
                     </execution>
                 </executions>
             </plugin>
-            <!--
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
@@ -170,7 +169,6 @@
                     </execution>
                 </executions>
             </plugin>
-            -->
         </plugins>
     </build>
     <distributionManagement>

site/advanced/nativeapi.md

@@ -331,7 +331,7 @@ arguments and getting return values.
         engine.eval("sub applePie\nglobal a\na = \"hello world\"\nEndSub");
         String a = (String) engine.getVariable("a");
         assertNull(a);
-        engine.call("applePie", (Object[]) null);
+        engine.getSubroutine("applePie").call( (Object[]) null);
         a = (String) engine.getVariable("a");
         assertEquals("hello world", a);
 ```
@@ -345,7 +345,7 @@ arguments and getting return values.
         String a = (String) engine.getVariable("a");
         assertNull(a);
         @SuppressWarnings("deprecation")
-        Long ret = (Long) engine.call("applePie", "hello world");
+        Long ret = (Long) engine.getSubroutine("applePie").call( "hello world");
         a = (String) engine.getVariable("a");
         assertEquals("hello world", a);
         assertEquals((Long) 6L, ret);

src/main/java/com/scriptbasic/Engine.java

@@ -217,34 +217,21 @@ public Iterable<String> getVariablesIterator() {
         return ctx.interpreter.getVariables().getGlobalMap().getVariableNameSet();
     }
 
-    @Override
-    public Object call(final String subroutineName, final Object... args)
-            throws ScriptBasicException {
-        try {
-            return ctx.interpreter.call(subroutineName, args);
-        } catch (final ExecutionException e) {
-            throw new ScriptBasicException(e);
-        }
-    }
 
-    @Override
-    public Iterable<String> getSubroutineNames() {
-        return ctx.interpreter.getProgram().getNamedCommandNames();
-    }
 
-    private void SubroutineDoesNotExistWTF(final Exception e) {
+    private void SNAFU_SubroutineDoesNotExist(final Exception e) {
         throw new BasicInterpreterInternalError(
                 "An already located subroutine does not exist", e);
     }
 
     @Override
     public Iterable<Subroutine> getSubroutines() {
         if (theMapHasToBeFilled) {
-            for (final String s : getSubroutineNames()) {
+            for (final String s : ctx.interpreter.getProgram().getNamedCommandNames()) {
                 try {
                     getSubroutine(s);
                 } catch (final ScriptBasicException e) {
-                    SubroutineDoesNotExistWTF(e);
+                    SNAFU_SubroutineDoesNotExist(e);
                 }
             }
             theMapHasToBeFilled = false;
@@ -262,8 +249,7 @@ private CommandSub getCommandSub(final String subroutineName)
         return commandSub;
     }
 
-    @Override
-    public int getNumberOfArguments(final String subroutineName)
+    private int getNumberOfArguments(final String subroutineName)
             throws ScriptBasicException {
         final CommandSub commandSub = getCommandSub(subroutineName);
         final int size;
@@ -305,7 +291,7 @@ public int getNumberOfArguments() {
             try {
                 return Engine.this.getNumberOfArguments(name);
             } catch (final ScriptBasicException e) {
-                SubroutineDoesNotExistWTF(e);
+                SNAFU_SubroutineDoesNotExist(e);
                 return 0;// will not get here
             }
         }
@@ -317,7 +303,11 @@ public String getName() {
 
         @Override
         public Object call(final Object... args) throws ScriptBasicException {
-            return Engine.this.call(name, args);
+            try {
+                return ctx.interpreter.call(name, args);
+            } catch (final ExecutionException e) {
+                throw new ScriptBasicException(e);
+            }
         }
 
         @Override

src/main/java/com/scriptbasic/api/ScriptBasic.java

@@ -262,50 +262,6 @@ void eval(String sourceName, SourceProvider provider)
      */
     Iterable<Subroutine> getSubroutines();
 
-    /**
-     * Call the named subroutine with the arguments.
-     * <p>
-     * It is recommended to call subroutines via a
-     * {@link Subroutine} object.
-     *
-     * @param subroutineName the name of the subroutine to be called.
-     * @param args           the arguments to be passed to the subroutine. Note that there
-     *                       has to be that many arguments passed as many arguments are
-     *                       needed by the subroutine. If there are less number of actual
-     *                       arguments the rest of the arguments will be undefined. If you
-     *                       pass more actual arguments than the subroutine expects you
-     *                       will get an exception.
-     * @return the value returned by the subroutine. Note that this value is
-     * already converted to Java object and not a raw ScriptBasic
-     * {@code RightValue} but rather a {@code Long}, {@code Double},
-     * {@code String} or similar.
-     * @throws ScriptBasicException
-     * @deprecated
-     */
-    Object call(String subroutineName, Object... args)
-            throws ScriptBasicException;
-
-    /**
-     * Get the names of all subroutines.
-     *
-     * @return the iterator that can be used to iterate through the names of all
-     * the subroutines defined in the program.
-     */
-    Iterable<String> getSubroutineNames();
-
-    /**
-     * Get the number of expected argument of the named subroutine.
-     * <p>
-     * It is recommended to call subroutines via a
-     * {@link Subroutine} object.
-     *
-     * @param subroutineName the name of the subroutine.
-     * @return the number of arguments the subroutine expects.
-     * @throws ScriptBasicException
-     * @deprecated
-     */
-    int getNumberOfArguments(String subroutineName) throws ScriptBasicException;
-
     /**
      * Register the static methods of the class as BASIC functions. After the
      * registration the methods can be called from BASIC just as if they were

src/test/java/com/scriptbasic/Executor.java

@@ -9,6 +9,7 @@
 
 import java.io.*;
 import java.util.Map;
+import java.util.Optional;
 
 /**
  * Execute a BASIC program available in the resource file. stdin, stdout and
@@ -26,27 +27,33 @@ public void setMap(Map<String, Object> map) {
 
     public void execute(String resourceName) throws AnalysisException,
             ExecutionException, ClassNotFoundException {
-        StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
-        InputStream is = Class.forName(stackTrace[2].getClassName())
-                .getResourceAsStream(resourceName);
-        final Reader r = new InputStreamReader(is);
-        final Context ctx = ContextBuilder.from(r);
-        ctx.interpreter.registerFunctions(FileHandlingFunctions.class);
-        ctx.interpreter.setProgram(ctx.syntaxAnalyzer.analyze());
-        StringWriter writer = new StringWriter();
-        ctx.interpreter.setOutput(writer);
-        StringWriter errorWriter = new StringWriter();
-        ctx.interpreter.setError(errorWriter);
-        StringReader inputReader = getSStdin() == null ? null
-                : new StringReader(getSStdin());
-        ctx.interpreter.setInput(inputReader);
-        if (map != null) {
-            for (String key : map.keySet()) {
-                ctx.interpreter.setVariable(key, map.get(key));
+        Optional<StackWalker.StackFrame> frame =
+                StackWalker.getInstance(StackWalker.Option.RETAIN_CLASS_REFERENCE).walk(s -> s.skip(1).findFirst());
+        if (frame.isPresent()) {
+
+            InputStream is = Class.forName(frame.get().getClassName())
+                    .getResourceAsStream(resourceName);
+            final Reader r = new InputStreamReader(is);
+            final Context ctx = ContextBuilder.from(r);
+            ctx.interpreter.registerFunctions(FileHandlingFunctions.class);
+            ctx.interpreter.setProgram(ctx.syntaxAnalyzer.analyze());
+            StringWriter writer = new StringWriter();
+            ctx.interpreter.setOutput(writer);
+            StringWriter errorWriter = new StringWriter();
+            ctx.interpreter.setError(errorWriter);
+            StringReader inputReader = getSStdin() == null ? null
+                    : new StringReader(getSStdin());
+            ctx.interpreter.setInput(inputReader);
+            if (map != null) {
+                for (String key : map.keySet()) {
+                    ctx.interpreter.setVariable(key, map.get(key));
+                }
             }
+            ctx.interpreter.execute();
+            setSStdout(writer.toString());
+        } else {
+            throw new ClassNotFoundException();
         }
-        ctx.interpreter.execute();
-        setSStdout(writer.toString());
     }
 
     public void assertOutput(String s) {

src/test/java/com/scriptbasic/TestEngine.java

@@ -19,6 +19,7 @@
 import java.io.StringWriter;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.concurrent.atomic.AtomicInteger;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNull;
@@ -192,7 +193,7 @@ public void testSubroutineCallWOArgumentsWORetvalLocalVarIsLocal()
         engine.eval("sub applePie\na = \"hello world\"\nEndSub");
         String a = (String) engine.getVariable("a");
         assertNull(a);
-        engine.call("applePie", (Object[]) null);
+        engine.getSubroutine("applePie").call((Object[]) null);
         a = (String) engine.getVariable("a");
         assertNull(a);
     }
@@ -205,7 +206,7 @@ public void testSubroutineCallWOArgumentsWORetval() throws Exception {
         engine.eval("sub applePie\nglobal a\na = \"hello world\"\nEndSub");
         String a = (String) engine.getVariable("a");
         assertNull(a);
-        engine.call("applePie", (Object[]) null);
+        engine.getSubroutine("applePie").call( (Object[]) null);
         a = (String) engine.getVariable("a");
         assertEquals("hello world", a);
         // END SNIPPET: subroutineCallWOArgumentsWORetval
@@ -219,7 +220,7 @@ public void testSubroutineCallWArgumentsWORetval() throws Exception {
         engine.eval("sub applePie(b)\nglobal a\na = b\nEndSub");
         String a = (String) engine.getVariable("a");
         assertNull(a);
-        engine.call("applePie", "hello world");
+        engine.getSubroutine("applePie").call( "hello world");
         a = (String) engine.getVariable("a");
         assertEquals("hello world", a);
         // END SNIPPET: subroutineCallWArgumentsWORetval
@@ -258,7 +259,7 @@ public void testSubroutineCallWArgumentsWORetvalOO() throws Exception {
     public void testSubroutineCallWArgumentsWRetval1() throws Exception {
         ScriptBasic engine = ScriptBasic.getEngine();
         engine.eval("sub applePie(b)\nglobal a\na = b\nreturn 6\nEndSub");
-        engine.call("applePie", "hello world", "mama");
+        engine.getSubroutine("applePie").call( "hello world", "mama");
     }
 
     @SuppressWarnings("deprecation")
@@ -267,7 +268,7 @@ public void testSubroutineCallWArgumentsWRetval2() throws Exception {
         ScriptBasic engine = ScriptBasic.getEngine();
         engine.eval("sub applePie(b,c)\nglobal a\na = c\nreturn 6\nEndSub");
         String a = (String) engine.getVariable("a");
-        engine.call("applePie", "hello world");
+        engine.getSubroutine("applePie").call( "hello world");
         a = (String) engine.getVariable("a");
         assertNull(a);
     }
@@ -280,7 +281,7 @@ public void testSubroutineCallWArgumentsWRetval() throws Exception {
         String a = (String) engine.getVariable("a");
         assertNull(a);
         @SuppressWarnings("deprecation")
-        Long ret = (Long) engine.call("applePie", "hello world");
+        Long ret = (Long) engine.getSubroutine("applePie").call( "hello world");
         a = (String) engine.getVariable("a");
         assertEquals("hello world", a);
         assertEquals((Long) 6L, ret);
@@ -308,14 +309,11 @@ public void testSubroutineList() throws Exception {
         // START SNIPPET: subroutineList
         ScriptBasic engine = ScriptBasic.getEngine();
         engine.eval("sub applePie(b)\nEndSub\nsub anotherSubroutine\nEndSub\n");
-        int i = 0;
-        for (@SuppressWarnings("unused")
-                String subName : engine.getSubroutineNames()) {
-            i++;
-        }
-        assertEquals(2, i);
-        assertEquals(1, engine.getNumberOfArguments("applePie"));
-        assertEquals(0, engine.getNumberOfArguments("anotherSubroutine"));
+        final AtomicInteger i = new AtomicInteger(0);
+        engine.getSubroutines().forEach( (s) ->i.incrementAndGet());
+        assertEquals(2, i.get());
+        assertEquals(1, engine.getSubroutine("applePie").getNumberOfArguments());
+        assertEquals(0, engine.getSubroutine("anotherSubroutine").getNumberOfArguments());
         // END SNIPPET: subroutineList
     }