Revert last commit changes as requested

Co-authored-by: baseTwo <[email protected]>

Author: Copilot

Cql/Cql.Firely/Comparers/CodeableConceptVsCqlCodeComparer.cs

@@ -26,5 +26,5 @@ internal class CodeableConceptVsCqlCodeComparer() : CqlComparerWrapper<object /*
     {
         CodeableConcept { Coding: [{ } coding] } => new CqlCode(coding.Code, coding.System, coding.Version, coding.Display),
         CqlCode c                                => c,
-        _                                        => throw new CouldNotConvertInstanceToTargetType(outer ?? new object(), typeof(CqlCode)).ToException(),
+        _                                        => throw new CouldNotConvertInstanceToTargetType(outer, typeof(CqlCode)).ToException(),
     });

Cql/CqlToElmTests/(tests)/EquivalentTest.cs

@@ -1522,6 +1522,7 @@ include FHIRHelpers version '4.0.1'
         }
 
         [TestMethod]
+        [Ignore("Will fix in https://github.com/FirelyTeam/firely-cql-sdk/issues/788")]
         public void FhirCodeableConcept_EquivalentTo_Code()
         {
             var cqlToolkit = CreateCqlToolkit().AddFHIRHelpers();
@@ -1545,7 +1546,7 @@ include FHIRHelpers version '4.0.1'
 
                  define "Code1": Code { system: 'http://loinc.org', code: '8480-6', display: 'Systolic blood pressure' }
 
-                 define "AreEquivalent": EquivalentCodeableConceptCode("Fhir Codeable Concept", "Code1")
+                 define "AreEquivalent": "Fhir Codeable Concept" ~ "Code1"
                  """);
             Assert.IsNotNull(library.statements);
         }

Cql/CqlToElmTests/CqlToolkitTestExtensions.cs

@@ -37,7 +37,7 @@ public static InvocationBuilder GetInvocationBuilder(this CqlToolkit cqlToolkit)
     public static SystemLibrary GetSystemLibrary(this CqlToolkit cqlToolkit) =>
         cqlToolkit.GetCqlRequiredService<SystemLibrary>();
 
-    private static CqlLibraryString FHIRHelpers { get; } = CqlLibraryString.Parse(File.ReadAllText(Path.Combine("Input", "FHIRHelpers-4.0.1.cql")));
+    private static CqlLibraryString FHIRHelpers { get; } = CqlLibraryString.Parse(File.ReadAllText(@"Input\FHIRHelpers-4.0.1.cql"));
 
     public static CqlToolkit AddFHIRHelpers(this CqlToolkit cqlToolkit) => cqlToolkit.AddCqlLibraries(FHIRHelpers);
 

Cql/CqlToElmTests/Input/FHIRHelpers-4.0.1.cql

@@ -109,15 +109,6 @@ define function ToConcept(concept FHIR.CodeableConcept):
             display: concept.text.value
         }
 
-define function "~"(left FHIR.CodeableConcept, right System.Code):
-    exists (left.coding C where ToCode(C) ~ right)
-
-define function "~"(left System.Code, right FHIR.CodeableConcept):
-    exists (right.coding C where left ~ ToCode(C))
-
-define function "EquivalentCodeableConceptCode"(left FHIR.CodeableConcept, right System.Code):
-    exists (left.coding coding where ToCode(coding) ~ right)
-
 
 define function ToString(value AccountStatus): value.value
 define function ToString(value ActionCardinalityBehavior): value.value