Update iif function to 2 and 3 args

beda-software · Aug 3, 2023 · f23bd6a · f23bd6a
1 parent 92daec5
commit f23bd6a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/fhirpathpy/engine/invocations/__init__.py b/fhirpathpy/engine/invocations/__init__.py
@@ -38,7 +38,7 @@
     "skip": {"fn": filtering.skip_fn, "arity": {1: ["Integer"]}},
     "intersect": {"fn": subsetting.intersect_fn, "arity": {1: ["AnyAtRoot"]}},
     "combine": {"fn": combining.combine_fn, "arity": {1: ["AnyAtRoot"]}},
-    "iif": {"fn": misc.iif_macro, "arity": {3: ["Expr", "Expr", "Expr"]}},
+    "iif": {"fn": misc.iif_macro, "arity": {2: ["Expr", "Expr"], 3: ["Expr", "Expr", "Expr"]}},
     "trace": {"fn": misc.trace_fn, "arity": {0: [], 1: ["String"]}},
     "toInteger": {"fn": misc.to_integer},
     "toDecimal": {"fn": misc.to_decimal},

diff --git a/fhirpathpy/engine/invocations/misc.py b/fhirpathpy/engine/invocations/misc.py
@@ -9,11 +9,13 @@
 numRegex = re.compile(r"^[+-]?\d+(\.\d+)?$")
 
 
-def iif_macro(ctx, data, cond, ok, fail):
+def iif_macro(ctx, data, cond, ok, fail=None):
     if util.is_true(cond(data)):
         return ok(data)
-
-    return fail(data)
+    elif fail:
+        return fail(data)
+    else:
+        return []
 
 
 def trace_fn(ctx, x, label=""):