xsd2ttcn: enumeration in union conversion fix (Bug 511912)

Change-Id: I83ec8fd50fe35e14b18dce643b4dc7b8a8e41656
Signed-off-by: BenceJanosSzabo <bence.janos.szabo@ericsson.com>

regression_test/XML/XmlWorkflow/XmlTest_expectedTtcns/www_example_org_enumeration_restriction_e.ttcn

@@ -154,6 +154,26 @@ type Only_int Ints (
 );
 
 
+type union UnionWithEnumField
+{
+	enumerated {
+		x,
+		none_,
+		type_
+	} alt_,
+	XSD.PositiveInteger alt_1 (1 .. !1000000)
+}
+with {
+  variant "useUnion";
+  variant "element";
+  variant (alt_) "name as ''";
+  variant (alt_) "text 'none_' as 'none'";
+  variant (alt_) "text 'type_' as 'type'";
+  variant (alt_) "text 'x' as ''";
+  variant (alt_1) "name as ''";
+};
+
+
 }
 with {
   encode "XML";

regression_test/XML/XmlWorkflow/xsd/enumeration_restriction.xsd

@@ -125,4 +125,23 @@
 	</xs:restriction>
 </xs:simpleType>
 
+<xs:element name="UnionWithEnumField">
+	<xs:simpleType>
+		<xs:union>
+			<xs:simpleType>
+				<xs:restriction base="xs:normalizedString">
+					<xs:enumeration value=""/>
+					<xs:enumeration value="none"/>
+					<xs:enumeration value="type"/>
+				</xs:restriction>
+			</xs:simpleType>
+			<xs:simpleType>
+				<xs:restriction base="xs:positiveInteger">
+					<xs:maxExclusive value="1000000"/>
+				</xs:restriction>
+			</xs:simpleType>
+		</xs:union>
+	</xs:simpleType>
+</xs:element>
+
 </xs:schema>

xsdconvert/GeneralTypes.hh

@@ -148,7 +148,7 @@ public:
   }
 
   QualifiedName(const Mstring& ns, const Mstring nm)
-  : nsuri(ns), name(nm), dup(false) {
+  : nsuri(ns), name(nm), orig_name(nm), dup(false) {
   }
 
   QualifiedName(const Mstring& ns, const Mstring nm, const Mstring orig)