fixed substitution group parsing. (GH-25)

eed3si9n · Jan 25, 2011 · a2927e7 · a2927e7
1 parent bda8887
commit a2927e7
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/cli/src/main/scala/scalaxb/compiler/xsd/Parsers.scala b/cli/src/main/scala/scalaxb/compiler/xsd/Parsers.scala
@@ -176,9 +176,9 @@ trait Parsers extends Args with Params {
   def buildSubstitionGroupParser(elem: ElemDecl, occurrence: Occurrence, mixed: Boolean): String = {
     log("Parsers#buildSubstitionGroupParser")    
 
-    val particles = schema.topElems.valuesIterator.toList filter { x =>
-      x.substitutionGroup map { sub => 
-        elements(sub._1, sub._2) == elem
+    val particles = schema.topElems.valuesIterator.toList filter {
+      _.substitutionGroup map { sub =>
+        sub._1 == elem.namespace && sub._2 == elem.name
       } getOrElse { false }
     }
     val parserList = particles map { particle =>
@@ -187,7 +187,7 @@ trait Parsers extends Args with Params {
     val choiceOperator = "|"
     val base = if (parserList.size > 0)
       parserList.mkString(" " + choiceOperator + " " + newline + indent(3))
-    else ""
+    else "any"
 
     buildParserString(base, occurrence)
   }

diff --git a/integration/src/test/resources/general.xsd b/integration/src/test/resources/general.xsd
@@ -265,7 +265,16 @@
 			</xs:element>
     </xs:sequence>
   </xs:complexType>
-
+
+  <xs:element name="SubstitutionGroup" type="xs:anyType" abstract="true"/>
+  <xs:element name="SubGroupMember" type="gen:MilkType" substitutionGroup="gen:SubstitutionGroup"/>
+  <xs:element name="SubGroupMember2" type="gen:Person" substitutionGroup="gen:SubstitutionGroup"/>
+  <xs:complexType name="SubstitutionGroupTest">
+    <xs:sequence>
+      <xs:element ref="gen:SubstitutionGroup"/>
+    </xs:sequence>
+  </xs:complexType>
+
   <xs:element name="longAttributeTest">
     <xs:complexType>
       <xs:attribute name="milk1" type="gen:MilkType"/>