Fix parsing of function parameters for #320 (#321)

metaschema-framework · Jan 2, 2025 · f73954c · f73954c
1 parent ee233b5
commit f73954c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/BuildCSTVisitor.java b/core/src/main/java/gov/nist/secauto/metaschema/core/metapath/cst/BuildCSTVisitor.java
@@ -415,7 +415,7 @@ public IExpression handleInlinefunctionexpr(Metapath10.InlinefunctionexprContext
             0,
             2,
             (ctx, idx) -> {
-              int pos = (idx - 1) / 2;
+              int pos = idx / 2;
               ParamContext tree = ctx.param(pos);
               return IArgument.of(
                   getContext().parseVariableName(ObjectUtils.notNull(tree.eqname().getText())),

diff --git a/...rc/test/java/gov/nist/secauto/metaschema/core/metapath/cst/AnonymousFunctionCallTest.java b/...rc/test/java/gov/nist/secauto/metaschema/core/metapath/cst/AnonymousFunctionCallTest.java
@@ -7,9 +7,12 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import static gov.nist.secauto.metaschema.core.metapath.TestUtils.qname;
 import gov.nist.secauto.metaschema.core.metapath.DynamicContext;
 import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression;
 import gov.nist.secauto.metaschema.core.metapath.StaticContext;
+import gov.nist.secauto.metaschema.core.metapath.IMetapathExpression.ResultType;
+import gov.nist.secauto.metaschema.core.qname.IEnhancedQName;
 
 import org.junit.jupiter.api.Test;
 
@@ -51,7 +54,15 @@ void test() {
 
   @Test
   void testMultipleParameters() {
-    // FIXME: Add test for function with multiple parameters
+	    StaticContext staticContext = StaticContext.builder()
+	            .namespace("ex", NS)
+	            .build();
+	    DynamicContext dynamicContext = new DynamicContext(staticContext);
+	    String metapath = "function ($argument1 as meta:string, $argument2 as meta:string) as meta:string { $argument2 }";
+	    dynamicContext.bindVariableValue(qname(NS, "boom"), 
+	    		IMetapathExpression.compile(metapath, staticContext).evaluate(null, dynamicContext));    
+	    String result = IMetapathExpression.compile("$ex:boom('a', 'b')", staticContext).evaluateAs(null, ResultType.STRING , dynamicContext);
+	    assertEquals(result, "b");
   }
 
   @Test