diff options
| author | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-02-15 00:27:11 +0100 |
|---|---|---|
| committer | Andreas Stöckel <astoecke@techfak.uni-bielefeld.de> | 2015-02-15 00:27:11 +0100 |
| commit | 253492406f04657fe71e6c0c6603496241280478 (patch) | |
| tree | 5a9c1b785a5559025ff7d26bf9ed880ce98ff0ce /testdata/xmlparser/comments_domain.oxm | |
| parent | 551b7be64f207845cb05b8ec593f9bf2d7f0c940 (diff) | |
| parent | b708dd4cce828c1089a18fefcc22804f7cdad908 (diff) | |
Merge branch 'master' into astoecke_parser_stack_new
Conflicts:
application/CMakeLists.txt
application/src/core/parser/stack/DocumentHandler.hpp
application/src/core/parser/stack/DomainHandler.hpp
application/src/core/parser/stack/ImportIncludeHandler.hpp
Diffstat (limited to 'testdata/xmlparser/comments_domain.oxm')
| -rw-r--r-- | testdata/xmlparser/comments_domain.oxm | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/testdata/xmlparser/comments_domain.oxm b/testdata/xmlparser/comments_domain.oxm index 1336b47..4d8c531 100644 --- a/testdata/xmlparser/comments_domain.oxm +++ b/testdata/xmlparser/comments_domain.oxm @@ -4,11 +4,11 @@ <!-- an annotation comment --> <annotation name="comment"> - <field name="content" isSubtree="true"> - <child ref="book.paragraph"/> + <field name="content"> + <childRef ref="book.paragraph"/> </field> <field name="replies" isSubtree="true"> - <child ref="reply"/> + <childRef ref="reply"/> </field> </annotation> @@ -17,24 +17,24 @@ <!-- Is there a chance to prevent users from having to redefine these two fields in comment and reply? Could we use a fieldRef here? Or would that be circular? --> - <field name="content" isSubtree="true"> - <child ref="book.paragraph"/> + <field name="content"> + <childRef ref="book.paragraph"/> </field> <field name="replies" isSubtree="true"> - <child ref="reply"/> + <childRef ref="reply"/> </field> - <parent name="book.paragraph"> - <fieldRef name="$default"/> - </parent> + <parentRef ref="book.paragraph"> + <fieldRef ref="$default"/> + </parentRef> </struct> <!-- note that replies are organized in a tree fashion: One can also reply to a reply --> <struct name="reply"> - <field name="content" isSubtree="true"> - <child ref="book.paragraph"/> + <field name="content"> + <childRef ref="book.paragraph"/> </field> <field name="replies" isSubtree="true"> - <child ref="reply"/> + <childRef ref="reply"/> </field> </struct> </domain> |