Permalink
Browse files

solve issue 58: problem with attr.group and extend.

  • Loading branch information...
1 parent 9b3f910 commit 833fa057d199e0c9dc0232d560d2f742c57476b0 @willemdj committed Sep 13, 2016
Showing with 3 additions and 2 deletions.
  1. +1 −1 src/erlsom_parseXsd.erl
  2. +2 −1 src/erlsom_pass2.erl
@@ -353,7 +353,7 @@ xsdModel(Namespaces) ->
mn = 0,
mx = 1,
nr = 4},
- #el{alts = [#alt{tag = 'xsd:all', tp = 'allType'},
+ #el{alts = [%%#alt{tag = 'xsd:all', tp = 'allType'},
#alt{tag = 'xsd:sequence', tp = 'sequenceType'},
#alt{tag = 'xsd:choice', tp = 'choiceType'},
#alt{tag = 'xsd:group', tp = 'groupRefType'},
@@ -354,7 +354,8 @@ mergeAttrs(BaseAttrs, []) -> BaseAttrs;
mergeAttrs(BaseAttrs, [Attr | Attrs]) ->
mergeAttrs(mergeAttr(BaseAttrs, Attr), Attrs).
-mergeAttr([#attributeGroupRefType{id=Id} | BaseAttrs], #attributeGroupRefType{id=Id} = Attr) ->
+mergeAttr([#attributeGroupRefType{ref=Ref} | BaseAttrs],
+ #attributeGroupRefType{ref=Ref} = Attr) ->
[Attr | BaseAttrs];
mergeAttr([#attrib{name=Name} | BaseAttrs], #attrib{name=Name} = Attr) ->
[Attr | BaseAttrs];

0 comments on commit 833fa05

Please sign in to comment.