From a81701ab2733b24ee56b14e1b2712370ba24a158 Mon Sep 17 00:00:00 2001
From: Grahame Grieve <grahameg@gmail.com>
Date: Tue, 6 Aug 2019 14:49:22 +1000
Subject: [PATCH] fix SD loading order problem in main build

---
 .../fhir/r5/conformance/ProfileUtilities.java | 30 +++++++++++++++++--
 1 file changed, 28 insertions(+), 2 deletions(-)

diff --git a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java
index 791f450de..73e4c24b3 100644
--- a/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java
+++ b/org.hl7.fhir.r5/src/main/java/org/hl7/fhir/r5/conformance/ProfileUtilities.java
@@ -1206,6 +1206,8 @@ public class ProfileUtilities extends TranslatingUtilities {
         } else if (!ed.hasSliceName() && !s.equals("[x]")) {
           if (isDataType(s))
             typeList.add(new TypeSlice(ed, s));
+          else if (isConstrainedDataType(s))
+            typeList.add(new TypeSlice(ed, baseType(s)));
           else if (isPrimitive(Utilities.uncapitalize(s)))
             typeList.add(new TypeSlice(ed, Utilities.uncapitalize(s)));
         } else if (!ed.hasSliceName() && s.equals("[x]"))
@@ -3446,13 +3448,37 @@ public class ProfileUtilities extends TranslatingUtilities {
 
   private boolean isDataType(String value) {
     StructureDefinition sd = context.fetchTypeDefinition(value);
-    return sd != null && sd.getKind() == StructureDefinitionKind.COMPLEXTYPE;
+    if (sd == null) // might be running before all SDs are available
+      return Utilities.existsInList(value, "Address", "Age", "Annotation", "Attachment", "CodeableConcept", "Coding", "ContactPoint", "Count", "Distance", "Duration", "HumanName", "Identifier", "Money", "Period", "Quantity", "Range", "Ratio", "Reference", "SampledData", "Signature", "Timing", 
+            "ContactDetail", "Contributor", "DataRequirement", "Expression", "ParameterDefinition", "RelatedArtifact", "TriggerDefinition", "UsageContext");
+    else 
+      return sd.getKind() == StructureDefinitionKind.COMPLEXTYPE && sd.getDerivation() == TypeDerivationRule.SPECIALIZATION;
+  }
+
+  private boolean isConstrainedDataType(String value) {
+    StructureDefinition sd = context.fetchTypeDefinition(value);
+    if (sd == null) // might be running before all SDs are available
+      return Utilities.existsInList(value, "SimpleQuantity", "MoneyQuantity");
+    else 
+      return sd.getKind() == StructureDefinitionKind.COMPLEXTYPE && sd.getDerivation() == TypeDerivationRule.CONSTRAINT;
+  }
+
+  private String baseType(String value) {
+    StructureDefinition sd = context.fetchTypeDefinition(value);
+    if (sd != null) // might be running before all SDs are available
+      return sd.getType();
+    if (Utilities.existsInList(value, "SimpleQuantity", "MoneyQuantity"))
+      return "Quantity";
+     throw new Error("Internal error -  type not known "+value);
   }
 
 
   public boolean isPrimitive(String value) {
     StructureDefinition sd = context.fetchTypeDefinition(value);
-    return sd != null && sd.getKind() == StructureDefinitionKind.PRIMITIVETYPE;
+    if (sd == null) // might be running before all SDs are available
+      return Utilities.existsInList(value, "base64Binary", "boolean", "canonical", "code", "date", "dateTime", "decimal", "id", "instant", "integer", "markdown", "oid", "positiveInt", "string", "time", "unsignedInt", "uri", "url", "uuid");
+    else 
+      return sd.getKind() == StructureDefinitionKind.PRIMITIVETYPE;
   }
 
 //  private static String listStructures(StructureDefinition p) {