Fix bugs, remove unecessary null checks

cqframework · Dec 26, 2024 · 59e3270 · 59e3270
1 parent 64cf807
commit 59e3270
Show file tree

Hide file tree

Showing 21 changed files with 423 additions and 441 deletions.
diff --git a/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/CompilerOptions.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/CompilerOptions.kt
@@ -18,7 +18,7 @@ object CompilerOptions {
      */
     @JvmStatic
     fun getCompilerOptions(library: Library): Set<CqlCompilerOptions.Options>? {
-        if (library.annotation.isNullOrEmpty()) {
+        if (library.annotation.isEmpty()) {
             return null
         }
         val compilerOptions = getCompilerOptions(library.annotation as List<CqlToElmBase>)
@@ -74,7 +74,7 @@ object CompilerOptions {
      */
     @JvmStatic
     fun getCompilerVersion(library: Library): String? {
-        if (library.annotation.isNullOrEmpty()) {
+        if (library.annotation.isEmpty()) {
             return null
         }
         return getCompilerVersion(library.annotation as List<CqlToElmBase>)

diff --git a/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/Cql2ElmVisitor.kt b/Src/java/cql-to-elm/src/main/kotlin/org/cqframework/cql/cql2elm/Cql2ElmVisitor.kt