When element references simple type it should still be considered to be "string"

isimluk · isimluk · commit aad902274b27 · 2020-10-30T15:48:55.000+01:00
Addressing:
 # github.com/gocomply/scap/pkg/scap/models/oval_def
pkg/scap/models/oval_def/models.go:106:20: cannot refer to unexported name oval.string
pkg/scap/models/oval_def/models.go:106:20: undefined: oval.string
diff --git a/pkg/xsd/element.go b/pkg/xsd/element.go
@@ -107,7 +107,7 @@ func (e *Element) ContainsText() bool {
 }
 
 func (e *Element) isPlainString() bool {
-	return e.SimpleType != nil || (e.Type == "" && e.Ref == "" && e.ComplexType == nil)
+	return e.SimpleType != nil || (e.Type == "" && e.Ref == "" && e.ComplexType == nil) || (e.typ != nil && e.typ.GoTypeName() == "string")
 }
 
 func (e *Element) isArray() bool {

Original file line number	Diff line number	Diff line change
`@@ -107,7 +107,7 @@ func (e *Element) ContainsText() bool {`
`107`	`107`	`}`
`108`	`108`
`109`	`109`	`func (e *Element) isPlainString() bool {`
`110`		`- return e.SimpleType != nil \|\| (e.Type == "" && e.Ref == "" && e.ComplexType == nil)`
	`110`	`+ return e.SimpleType != nil \|\| (e.Type == "" && e.Ref == "" && e.ComplexType == nil) \|\| (e.typ != nil && e.typ.GoTypeName() == "string")`
`111`	`111`	`}`
`112`	`112`
`113`	`113`	`func (e *Element) isArray() bool {`