add support for innerxml

Author: miku

cmd/zek/main.go

@@ -36,6 +36,7 @@ var (
 	packageName          = flag.String("P", "", "if set, write out struct within a package with the given name")
 	fixedBanner          = flag.Bool("B", false, "use a fixed banner string (e.g. for CI)")
 	readAtMost           = flag.Int64("S", 0, "read at most this many tags, approximately (0=unlimited)")
+	useInnerXML          = flag.Bool("I", false, "use verbatim innerxml instead of chardata")
 )
 
 func main() {
@@ -106,6 +107,7 @@ func main() {
 	sw.Compact = !*nonCompact
 	sw.UniqueExamples = *uniqueExamples
 	sw.OmitEmptyText = *omitEmptyText
+	sw.UseInnerXML = *useInnerXML
 	if *fixedBanner {
 		sw.Banner = fmt.Sprintf(`generated automatically by zek %s. DO NOT EDIT.`, zek.Version)
 	}

structwriter.go

@@ -127,6 +127,7 @@ type StructWriter struct {
 	Compact           bool                // Emit more compact struct.
 	UniqueExamples    bool                // Filter out duplicated examples
 	OmitEmptyText     bool                // Don't generate Text fields if no example elements have chardata.
+	UseInnerXML       bool                // Use innerxml instead of chardata for text.
 }
 
 // NewStructWriter returns a StructWriter that can write a node to a given
@@ -206,11 +207,15 @@ func (sw *StructWriter) writeChardataField(w io.Writer, node *Node) (int, error)
 	if !isValidName(textFieldName) {
 		return 0, fmt.Errorf("name clash, text field")
 	}
+	tag := "chardata"
+	if sw.UseInnerXML {
+		tag = "innerxml"
+	}
 	if sw.WithJSONTags {
-		s = fmt.Sprintf("%s string `xml:\",chardata\" json:\"%s,omitempty\"`",
-			textFieldName, strings.ToLower(textFieldName))
+		s = fmt.Sprintf("%s string `xml:\",%s\" json:\"%s,omitempty\"`",
+			textFieldName, tag, strings.ToLower(textFieldName))
 	} else {
-		s = fmt.Sprintf("%s string `xml:\",chardata\"`", textFieldName)
+		s = fmt.Sprintf("%s string `xml:\",%s\"`", textFieldName, tag)
 	}
 	if sw.UniqueExamples {
 		node.Examples = uniqueStrings(node.Examples)