Merge pull request #21 from sprin/fix_import_names

Ensure import names are valid Go identifiers

elemmakepkg.go

@@ -4,6 +4,7 @@ import (
 	"fmt"
 	"path"
 	"strings"
+	"unicode"
 
 	"github.com/go-utils/ustr"
 
@@ -516,7 +517,7 @@ func (me *Import) makePkg(bag *PkgBag) {
 	me.hasElemAnnotation.makePkg(bag)
 	for k, v := range bag.Schema.XMLNamespaces {
 		if v == me.Namespace {
-			impName = k
+			impName = safeIdentifier(k)
 			break
 		}
 	}
@@ -836,6 +837,24 @@ func sfmt(s string, a ...interface{}) string {
 	return fmt.Sprintf(s, a...)
 }
 
+// For any rune, return a rune that is a valid in an identifier
+func coerceToIdentifierRune(ch rune) rune {
+	if !unicode.IsLetter(ch) && !unicode.IsNumber(ch) {
+		return '_'
+	}
+	return ch
+}
+
+// Take any string and convert it to a valid identifier
+// Appends an underscore if the first rune is a number
+func safeIdentifier(s string) string {
+	s = strings.Map(coerceToIdentifierRune, s)
+	if unicode.IsNumber([]rune(s)[0]) {
+		s = fmt.Sprint("_", s)
+	}
+	return s
+}
+
 func subMakeElem(bag *PkgBag, td *declType, el *Element, done map[string]bool, parentMaxOccurs xsdt.Long, anns ...*Annotation) {
 	var elCache map[string]string
 	anns = append(anns, el.Annotation)

makepkg.go

@@ -274,6 +274,7 @@ func (me *PkgBag) resolveQnameRef(ref, pref string, noUsageRec *string) string {
 	}
 	if pos := strings.Index(ref, ":"); pos > 0 {
 		impName, ns = ref[:pos], me.Schema.XMLNamespaces[ref[:pos]]
+		impName = safeIdentifier(impName)
 		ref = ref[(pos + 1):]
 	}
 	if ns == xsdNamespaceUri {