Represent elements of choices as pointers (#105)

Author: marshallmoats-wk

genGo.go

@@ -225,8 +225,6 @@ func (gen *CodeGenerator) GoComplexType(v *ComplexType) {
 			if element.Optional {
 				if !element.Plural && !strings.HasPrefix(fieldType, `*`) {
 					fieldType = "*" + fieldType
-				} else {
-					optional = `,omitempty`
 				}
 			}
 			if fieldType == "time.Time" {

test/c/base64.xsd.h

@@ -50,6 +50,13 @@ typedef struct {
 	MyType4 Title;
 } MyType10;
 
+// MyType11 ...
+typedef struct {
+	int Option1;
+	char Option2;
+	MyType10 Option3;
+} MyType11;
+
 // TopLevel ...
 typedef struct {
 	float CostAttr; // attr, optional

test/go/base64.xsd.go

@@ -88,6 +88,16 @@ public class MyType10 {
 	protected MyType4 Title;
 }
 
+// MyType11 ...
+public class MyType11 {
+	@XmlElement(name = "option1")
+	protected Integer Option1;
+	@XmlElement(name = "option2")
+	protected String Option2;
+	@XmlElement(name = "option3")
+	protected MyType10 Option3;
+}
+
 // TopLevel ...
 public class TopLevel extends MyType6  {
 	@XmlAttribute(name = "cost")
@@ -96,8 +106,8 @@ public class TopLevel extends MyType6  {
 	protected String LastUpdatedAttr;
 	@XmlElement(name = "nested")
 	protected MyType7 Nested;
-	@XmlElement(required = true, name = "myType1")
+	@XmlElement(name = "myType1")
 	protected List<List<Byte>> MyType1;
-	@XmlElement(required = true, name = "myType2")
+	@XmlElement(name = "myType2")
 	protected List<MyType2> MyType2;
 }

test/java/base64.xsd.java

@@ -100,6 +100,18 @@ pub struct MyType10 {
 }
 
 
+// MyType11 ...
+#[derive(Debug, Deserialize, Serialize, PartialEq)]
+pub struct MyType11 {
+	#[serde(rename = "option1")]
+	pub option1: Option<i32>,
+	#[serde(rename = "option2")]
+	pub option2: Option<String>,
+	#[serde(rename = "option3")]
+	pub option3: Option<MyType10>,
+}
+
+
 // TopLevel ...
 #[derive(Debug, Deserialize, Serialize, PartialEq)]
 pub struct TopLevel {

test/rs/base64.xsd.rs

@@ -53,11 +53,18 @@ export class MyType10 {
 	Title: MyType4;
 }
 
+// MyType11 ...
+export class MyType11 {
+	Option1?: number;
+	Option2?: string;
+	Option3?: MyType10;
+}
+
 // TopLevel ...
 export class TopLevel extends MyType6  {
 	CostAttr?: number;
 	LastUpdatedAttr: string;
 	Nested?: MyType7;
-	MyType1: Uint8Array;
-	MyType2: Array<MyType2>;
+	MyType1?: Uint8Array;
+	MyType2?: Array<MyType2>;
 }

test/ts/base64.xsd.ts

@@ -72,6 +72,14 @@
     </sequence>
   </complexType>
 
+  <complexType name="MyType11">
+    <choice>
+      <element name="option1" type="int" />
+      <element name="option2" type="string" />
+      <element name="option3" type="here:MyType10" />
+    </choice>
+  </complexType>
+
   <element name="TopLevel">
     <complexType>
       <complexContent>

test/xsd/base64.xsd

@@ -74,6 +74,7 @@ func (opt *Options) OnElement(ele xml.StartElement, protoTree []interface{}) (er
 	}
 
 	if opt.Choice.Len() > 0 {
+		e.Optional = true
 		e.Plural = e.Plural || opt.Choice.Peek().(*Choice).Plural
 	}