argument arrays replaced by List

Author: raydac

jcp-tests/jcp-test-maven-action/jcp-test-maven-action-action/src/main/java/com/igormaznitsa/jcp/it/CustomPreprocessorExtension.java

@@ -17,16 +17,16 @@ public boolean hasAction(int arity) {
   }
 
   @Override
-  public boolean hasUserFunction(String name, int arity) {
+  public boolean hasUserFunction(String name, Set<Integer> arity) {
     if ("hellofunc".equals(name)) {
-      return arity == ANY_ARITY || arity == 1;
+      return arity.isEmpty() || arity.contains(1);
     }
     return false;
   }
 
   @Override
-  public boolean processAction(PreprocessorContext context, Value[] parameters) {
-    System.out.println("Called action for parameters: " + Arrays.toString(parameters));
+  public boolean processAction(PreprocessorContext context, List<Value> parameters) {
+    System.out.println("Called action for parameters: " + parameters);
     return true;
   }
 

jcp/src/main/java/com/igormaznitsa/jcp/directives/ActionDirectiveHandler.java

@@ -28,13 +28,13 @@
 import com.igormaznitsa.jcp.expression.ExpressionItem;
 import com.igormaznitsa.jcp.expression.ExpressionParser;
 import com.igormaznitsa.jcp.expression.ExpressionTree;
-import com.igormaznitsa.jcp.expression.Value;
 import com.igormaznitsa.jcp.extension.PreprocessorExtension;
 import java.io.IOException;
 import java.io.PushbackReader;
 import java.io.StringReader;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * The class implements the //#action directive handler
@@ -83,14 +83,9 @@ public AfterDirectiveProcessingBehaviour execute(final String string,
             null);
       }
 
-      final Value[] argValues = new Value[args.size()];
-      int index = 0;
-      for (final ExpressionTree expr : args) {
-        final Value val = Expression.evalTree(expr, context);
-        argValues[index++] = val;
-      }
-
-      if (!extension.processAction(context, argValues)) {
+      if (!extension.processAction(context,
+          args.stream().map(x -> Expression.evalTree(x, context)).collect(
+              Collectors.toList()))) {
         throw context.makeException("Unable to process an action", null);
       }
     } catch (IOException ex) {

jcp/src/main/java/com/igormaznitsa/jcp/expression/Expression.java

@@ -21,6 +21,8 @@
 
 package com.igormaznitsa.jcp.expression;
 
+import static com.igormaznitsa.jcp.expression.ExpressionTreeElement.ANY_ARITY;
+
 import com.igormaznitsa.jcp.context.PreprocessorContext;
 import com.igormaznitsa.jcp.exceptions.FilePositionInfo;
 import com.igormaznitsa.jcp.exceptions.PreprocessorException;
@@ -140,6 +142,9 @@ private ExpressionTreeElement evalFunction(
     final List<List<ValueType>> allowedSignatures = functionElement.getAllowedArgumentTypes();
     List<ValueType> allowed = null;
     for (final List<ValueType> current : allowedSignatures) {
+      if (current.size() != arguments.size()) {
+        continue;
+      }
       boolean allCompatible = true;
 
       int thatIndex = 0;
@@ -161,9 +166,13 @@ private ExpressionTreeElement evalFunction(
     }
 
     if (allowed == null) {
-      throw context.makeException(
-          "[Expression]Unsupported argument detected for '" + functionElement.getName() + '\'',
-          null);
+      if (functionElement.getArity().contains(ANY_ARITY)) {
+        signature.append(ValueType.ANY.getSignature());
+      } else {
+        throw context.makeException(
+            "[Expression]Unsupported argument detected for '" + functionElement.getName() + '\'',
+            null);
+      }
     }
 
     if (functionElement instanceof FunctionDefinedByUser) {

jcp/src/main/java/com/igormaznitsa/jcp/expression/ExpressionParser.java

@@ -609,7 +609,8 @@ ExpressionItem nextItem(final PushbackReader reader, final PreprocessorContext c
                 context.getPreprocessorExtensions().stream()
                     .filter(x -> x.isAllowed(context))
                     .filter(x -> x.hasUserFunction(userFunctionName,
-                        PreprocessorExtension.ANY_ARITY)).findFirst().orElse(null);
+                        Set.of()))
+                    .findFirst().orElse(null);
 
             if (preprocessorExtension == null) {
               throw context.makeException(

jcp/src/main/java/com/igormaznitsa/jcp/expression/ExpressionTreeElement.java

@@ -344,8 +344,10 @@ public void fillArguments(final List<ExpressionTree> arguments) {
           this.includeStack, null);
     }
 
-    if (childrenSlots.length != arguments.size()) {
-      throw new PreprocessorException("Wrong argument list size", this.sourceString,
+    if (!this.expectedArities.contains(ANY_ARITY) &&
+        !this.expectedArities.contains(arguments.size())) {
+      throw new PreprocessorException(
+          "Wrong argument list size, expected arities: " + this.expectedArities, this.sourceString,
           this.includeStack, null);
     }
 

jcp/src/main/java/com/igormaznitsa/jcp/expression/functions/FunctionDefinedByUser.java

@@ -81,8 +81,10 @@ public Value execute(final PreprocessorContext context, final List<Value> values
               null);
     }
 
+    final Set<Integer> expectedArity = Set.of(values.size());
+
     final PreprocessorExtension extension =
-        extensionList.stream().filter(x -> x.hasUserFunction(this.name, values.size()))
+        extensionList.stream().filter(x -> x.hasUserFunction(this.name, expectedArity))
             .findFirst().orElseThrow(() -> context
                 .makeException(
                     "Can't find any preprocessor extension to process function " + this.name + " for " +

jcp/src/main/java/com/igormaznitsa/jcp/extension/LogPreprocessorExtension.java

@@ -4,11 +4,11 @@
 import com.igormaznitsa.jcp.containers.TextFileDataContainer;
 import com.igormaznitsa.jcp.context.PreprocessorContext;
 import com.igormaznitsa.jcp.expression.Value;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 /**
  * Preprocessor extension which just make info logging for arguments of action calls and also
@@ -42,13 +42,14 @@ public boolean hasAction(int arity) {
   }
 
   @Override
-  public boolean hasUserFunction(String name, int arity) {
+  public boolean hasUserFunction(String name, Set<Integer> arity) {
     return true;
   }
 
   @Override
-  public boolean processAction(final PreprocessorContext context, final Value[] parameters) {
-    context.logInfo(String.format("Called action: %s at %s", Arrays.toString(parameters),
+  public boolean processAction(final PreprocessorContext context, final List<Value> parameters) {
+    context.logInfo(String.format("Called action: %s at %s", parameters.stream().map(
+            Value::toString).collect(Collectors.joining(",")),
         findPosition(context)));
     return true;
   }

jcp/src/main/java/com/igormaznitsa/jcp/extension/PreprocessorExtension.java

@@ -36,11 +36,6 @@
  */
 public interface PreprocessorExtension extends PreprocessorContextAware, ExecutionAllowable {
 
-  /**
-   * Undefined arity. In case of functions it means to check only name.
-   */
-  int ANY_ARITY = -1;
-
   @Override
   default boolean isAllowed(PreprocessorContext context) {
     return true;
@@ -59,12 +54,11 @@ default boolean isAllowed(PreprocessorContext context) {
    * Allows to check that the extension contains a user defined function with required number of parameters.
    *
    * @param name  name of the function to be checked, must not be null
-   * @param arity number of parameters for action, if ANY_ARITY then check only by name
+   * @param arity set of numbers of parameters for action, if empty set then check only name
    * @return true if such user defined function is provided by the extension
-   * @see #ANY_ARITY
-   * @since 7.2.2
+   * @since 7.3.0
    */
-  boolean hasUserFunction(String name, int arity);
+  boolean hasUserFunction(String name, Set<Integer> arity);
 
   /**
    * To process an action (it will be called if the preprocessor is met
@@ -74,8 +68,9 @@ default boolean isAllowed(PreprocessorContext context) {
    * @param parameters the parameters of the action directive, must not be null
    * @return true if the action has been processed successfully or false, if it
    * is false then exception will be thrown and preprocessing will be stopped
+   * @since 7.3.0
    */
-  boolean processAction(PreprocessorContext context, Value[] parameters);
+  boolean processAction(PreprocessorContext context, List<Value> parameters);
 
   /**
    * Call to process a user function (such functions start with $)
@@ -85,7 +80,7 @@ default boolean isAllowed(PreprocessorContext context) {
    *                     must not be null
    * @param arguments    the function arguments, must not be null
    * @return a calculated value, it must not be null
-   * @since 7.1.2
+   * @since 7.3.0
    */
   Value processUserFunction(PreprocessorContext context, String functionName,
                             List<Value> arguments);

jcp/src/test/java/com/igormaznitsa/jcp/context/PreprocessorContextTest.java

@@ -265,12 +265,12 @@ public boolean hasAction(int arity) {
           }
 
           @Override
-          public boolean hasUserFunction(String name, int arity) {
+          public boolean hasUserFunction(String name, Set<Integer> arity) {
             return true;
           }
 
           @Override
-          public boolean processAction(PreprocessorContext context, Value[] parameters) {
+          public boolean processAction(PreprocessorContext context, List<Value> parameters) {
             throw new UnsupportedOperationException(
                 "Not supported yet.");
           }

jcp/src/test/java/com/igormaznitsa/jcp/directives/ActionDirectiveHandlerTest.java

@@ -25,6 +25,7 @@
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyList;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.any;
 import static org.mockito.Mockito.eq;
@@ -35,6 +36,7 @@
 import com.igormaznitsa.jcp.context.PreprocessorContext;
 import com.igormaznitsa.jcp.expression.Value;
 import com.igormaznitsa.jcp.extension.PreprocessorExtension;
+import java.util.List;
 import org.junit.Test;
 import org.mockito.Mockito;
 
@@ -46,10 +48,10 @@ public class ActionDirectiveHandlerTest extends AbstractDirectiveHandlerAcceptan
   @Override
   public void testExecution() throws Exception {
     final PreprocessorExtension mockup = mock(PreprocessorExtension.class);
-    when(mockup.hasUserFunction(anyString(), anyInt())).thenReturn(true);
+    when(mockup.hasUserFunction(anyString(), any())).thenReturn(true);
     when(mockup.hasAction(anyInt())).thenReturn(true);
     when(mockup.isAllowed(any())).thenReturn(true);
-    when(mockup.processAction(any(PreprocessorContext.class), any(Value[].class))).thenReturn(
+    when(mockup.processAction(any(PreprocessorContext.class), anyList())).thenReturn(
         Boolean.TRUE);
 
     assertFilePreprocessing("directive_action.txt", false, mockup, null);
@@ -62,7 +64,7 @@ public void testExecution() throws Exception {
     final Value val6 = Value.valueOf("hello,");
 
     verify(mockup).processAction(any(PreprocessorContext.class),
-        eq(new Value[] {val1, val2, val3, val4, val5, val6}));
+        eq(List.of(val1, val2, val3, val4, val5, val6)));
   }
 
   @Test