From 76ab539306d98dfedb759731f6ea3808d3f5f9c0 Mon Sep 17 00:00:00 2001
From: Benjamin Paassen <bpaassen@techfak.uni-bielefeld.de>
Date: Tue, 10 Feb 2015 19:28:45 +0100
Subject: consistent nomenclature for reference concepts.

---
 testdata/xmlparser/book_domain.oxm     | 16 ++++++++--------
 testdata/xmlparser/comments_domain.oxm | 18 +++++++++---------
 testdata/xmlparser/headings_domain.oxm | 22 +++++++++++-----------
 3 files changed, 28 insertions(+), 28 deletions(-)

(limited to 'testdata')

diff --git a/testdata/xmlparser/book_domain.oxm b/testdata/xmlparser/book_domain.oxm
index 8b46460..c86d4e3 100644
--- a/testdata/xmlparser/book_domain.oxm
+++ b/testdata/xmlparser/book_domain.oxm
@@ -33,11 +33,11 @@
 			     effectively use forward declarations here. So the
 			     resolve() process may only be started _after_ all
 			     delcarations are read. -->
-			<child ref="book.chapter"/>
+			<childRef ref="book.chapter"/>
 			<!-- The dot notation as path separator might be changed
 			     but I think it to be intuitive. If we want a more
 			     CSS like style we can use whitespaces here. -->
-			<child ref="book.paragraph"/>
+			<childRef ref="book.paragraph"/>
 		</field>
 	</struct>
 	<struct name="chapter">
@@ -49,8 +49,8 @@
 		<!-- implicitly:
 		<field name="" isSubtree="false" optional="false">
 		-->
-			<child ref="book.section"/>
-			<child ref="book.paragraph"/>
+			<childRef ref="book.section"/>
+			<childRef ref="book.paragraph"/>
 		</field>
 	</struct>
 	<struct name="section">
@@ -62,8 +62,8 @@
 		<!-- implicitly:
 		<field name="" isSubtree="false" optional="false">
 		-->
-			<child ref="book.subsection"/>
-			<child ref="book.paragraph"/>
+			<childRef ref="book.subsection"/>
+			<childRef ref="book.paragraph"/>
 		</field>
 	</struct>
 	<struct name="subsection">
@@ -75,7 +75,7 @@
 		<!-- implicitly:
 		<field name="" isSubtree="false" optional="false">
 		-->
-			<child ref="book.paragraph"/>
+			<childRef ref="book.paragraph"/>
 		</field>
 	</struct>
 	<struct name="paragraph" transparent="true" role="paragraph">
@@ -87,7 +87,7 @@
 		<!-- implicitly:
 		<field name="" type="TREE" optional="false">
 		-->
-			<child ref="book.text"/>
+			<childRef ref="book.text"/>
 		</field>
 	</struct>
 	<struct name="text" transparent="true" role="text">
diff --git a/testdata/xmlparser/comments_domain.oxm b/testdata/xmlparser/comments_domain.oxm
index 1336b47..2a3ad59 100644
--- a/testdata/xmlparser/comments_domain.oxm
+++ b/testdata/xmlparser/comments_domain.oxm
@@ -5,10 +5,10 @@
 	<!-- an annotation comment -->
 	<annotation name="comment">
 		<field name="content" isSubtree="true">
-			<child ref="book.paragraph"/>
+			<childRef ref="book.paragraph"/>
 		</field>
 		<field name="replies" isSubtree="true">
-			<child ref="reply"/>
+			<childRef ref="reply"/>
 		</field>
 	</annotation>
 
@@ -18,23 +18,23 @@
 		     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"/>
+			<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"/>
+			<childRef ref="book.paragraph"/>
 		</field>
 		<field name="replies" isSubtree="true">
-			<child ref="reply"/>
+			<childRef ref="reply"/>
 		</field>
 	</struct>
 </domain>
diff --git a/testdata/xmlparser/headings_domain.oxm b/testdata/xmlparser/headings_domain.oxm
index 2238792..d421747 100644
--- a/testdata/xmlparser/headings_domain.oxm
+++ b/testdata/xmlparser/headings_domain.oxm
@@ -8,26 +8,26 @@
 		     that parent-child-relationship in this sense are mediated
 		     by fields. So we must either reference a field that is
 		     already there or declare a new one on the fly. -->
-		<parent name="book.book">
+		<parentRef ref="book.book">
 			<field name="heading" isSubtree="true" optional="true"/>
-		</parent>
-		<parent name="book.chapter">
+		</parentRef>
+		<parentRef ref="book.chapter">
 			<field name="heading" isSubtree="true" optional="true"/>
-		</parent>
-		<parent name="book.section">
+		</parentRef>
+		<parentRef ref="book.section">
 			<field name="heading" isSubtree="true" optional="true"/>
-		</parent>
-		<parent name="book.subsection">
+		</parentRef>
+		<parentRef ref="book.subsection">
 			<field name="heading" isSubtree="true" optional="true"/>
-		</parent>
-		<parent name="book.paragraph">
+		</parentRef>
+		<parentRef ref="book.paragraph">
 			<field name="heading" isSubtree="true" optional="true"/>
-		</parent>
+		</parentRef>
 		<!-- regarding its fields we have a problem here. We do not want to
 		     declare a new field, because in fact we want to allow every
 		     bit of content that a paragraph would allow - also considering
 		     possible extensions of paragraph by other domains.
 		     So we need to reference the default field of paragraph. -->
-		<fieldRef name="book.paragraph.$default"/>
+		<fieldRef ref="book.paragraph.$default"/>
 	</struct>
 </domain>
-- 
cgit v1.2.3