Merge branch 'master' into engine-coverage

Author: antvaset

Src/java/engine/src/main/kotlin/org/opencds/cqf/cql/engine/exception/Backtrace.kt

@@ -8,6 +8,7 @@ import org.hl7.elm.r1.Expression
 import org.hl7.elm.r1.ExpressionDef
 import org.hl7.elm.r1.FunctionDef
 import org.hl7.elm.r1.OperandDef
+import org.hl7.elm.r1.VersionedIdentifier
 import org.opencds.cqf.cql.engine.execution.State.ActivationFrame
 import org.opencds.cqf.cql.engine.execution.Variable
 
@@ -40,6 +41,7 @@ class Backtrace {
      * function or expression definition, function arguments, local variables as well as the name
      * and value of the CQL context.
      */
+    @Suppress("LongParameterList")
     class FunctionoidFrame(
         expression: Expression?,
         /**
@@ -69,6 +71,13 @@ class Backtrace {
          * @return A list of the [Variable]s that correspond to local variable bindings.
          */
         val localVariables: MutableList<Variable?>?,
+        /**
+         * Returns the name of the Library that was current during the evaluation represented by the
+         * frame.
+         *
+         * @return The name of the Library in context.
+         */
+        val libraryIdentifier: VersionedIdentifier?,
         /**
          * Returns the name of the CQL context that was current during the evaluation represented by
          * the frame.
@@ -91,12 +100,14 @@ class Backtrace {
         this.frames.add(frame)
     }
 
+    @Suppress("LongParameterList")
     fun maybeAddFrame(
         containingDefinition: ExpressionDef?,
         definitionFrame: ActivationFrame?,
         stack: Deque<ActivationFrame>,
         contextName: String?,
         contextValue: Any?,
+        libraryIdentifier: VersionedIdentifier?,
         expression: Expression?,
     ) {
         // When the EvaluationVisitor unwinds through
@@ -169,6 +180,7 @@ class Backtrace {
                 containingDefinition,
                 arguments,
                 localVariables,
+                libraryIdentifier,
                 contextName,
                 contextValue,
             )

Src/java/engine/src/main/kotlin/org/opencds/cqf/cql/engine/execution/EvaluationVisitor.kt

@@ -212,6 +212,7 @@ class EvaluationVisitor : BaseElmLibraryVisitor<Any?, State?>() {
                 context.stack,
                 context.getCurrentContext(),
                 context.currentContextValue,
+                context.getCurrentLibrary()?.identifier,
                 expression,
             )
         }

Src/java/engine/src/test/kotlin/org/opencds/cqf/cql/engine/execution/BacktraceTest.kt

@@ -6,6 +6,7 @@ import org.hamcrest.Matchers
 import org.hamcrest.TypeSafeMatcher
 import org.hl7.elm.r1.ExpressionDef
 import org.hl7.elm.r1.FunctionDef
+import org.hl7.elm.r1.VersionedIdentifier
 import org.junit.jupiter.api.Assertions
 import org.junit.jupiter.api.Test
 import org.opencds.cqf.cql.engine.exception.Backtrace.FunctionoidFrame
@@ -69,6 +70,32 @@ internal class BacktraceTest : CqlTestBase() {
         }
     }
 
+    internal class VersionedIdentifierMatcher(
+        private val expectedId: String?,
+        private val expectedVersion: String?,
+    ) : TypeSafeMatcher<VersionedIdentifier>() {
+        override fun matchesSafely(vi: VersionedIdentifier): Boolean {
+            return true
+        }
+
+        override fun describeTo(description: Description) {
+            description
+                .appendText("a library id")
+                .appendValue(expectedId)
+                .appendText("a library version")
+                .appendValue(expectedVersion)
+        }
+
+        companion object {
+            fun isVersionedIdentifier(
+                expectedId: String?,
+                expectedVersion: String?,
+            ): VersionedIdentifierMatcher {
+                return VersionedIdentifierMatcher(expectedId, expectedVersion)
+            }
+        }
+    }
+
     internal class ContextMatcher(
         private val expectedName: String?,
         private val expectedValue: Any?,
@@ -123,6 +150,13 @@ internal class BacktraceTest : CqlTestBase() {
                     VariableMatcher.isVariable("_", 1),
                 ),
             )
+            MatcherAssert.assertThat(
+                frame1Functionoid.libraryIdentifier,
+                VersionedIdentifierMatcher.isVersionedIdentifier(
+                    "BacktraceTest",
+                    expectedVersion = null,
+                ),
+            )
             MatcherAssert.assertThat(
                 frame1Functionoid,
                 ContextMatcher.hasContext("Unfiltered", null),
@@ -145,6 +179,13 @@ internal class BacktraceTest : CqlTestBase() {
                 ),
             )
             MatcherAssert.assertThat(frame2Functionoid.localVariables, Matchers.empty())
+            MatcherAssert.assertThat(
+                frame2Functionoid.libraryIdentifier,
+                VersionedIdentifierMatcher.isVersionedIdentifier(
+                    "BacktraceTest",
+                    expectedVersion = null,
+                ),
+            )
             MatcherAssert.assertThat(
                 frame2Functionoid,
                 ContextMatcher.hasContext("Unfiltered", null),
@@ -162,6 +203,13 @@ internal class BacktraceTest : CqlTestBase() {
             )
             MatcherAssert.assertThat(frame3Functionoid.arguments, Matchers.empty())
             MatcherAssert.assertThat(frame3Functionoid.localVariables, Matchers.empty())
+            MatcherAssert.assertThat(
+                frame3Functionoid.libraryIdentifier,
+                VersionedIdentifierMatcher.isVersionedIdentifier(
+                    "BacktraceTest",
+                    expectedVersion = null,
+                ),
+            )
             MatcherAssert.assertThat(
                 frame3Functionoid,
                 ContextMatcher.hasContext("Unfiltered", null),