Added XPointer: - configure.in Makefile.am include/makefile.am: adding

Added XPointer:
- configure.in Makefile.am include/makefile.am: adding XPointer
  and XPtrtests target
- xpointer.[ch] : new files for XPointer support
- test/XPath/xptr result/XPath/xptr: added XPointer testsuite and
  more XPath tests
Daniel

9 files changed, 266 insertions, 0 deletions

diff --git a/result/XPath/tests/chaptersbase b/result/XPath/tests/chaptersbase
index b004efe3..fd4040e4 100644
--- a/result/XPath/tests/chaptersbase
+++ b/result/XPath/tests/chaptersbase
@@ -35,10 +35,25 @@ Object is a Node Set :
 Set contains 6 nodes:
 1  ELEMENT head
 2  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter1
 3  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter2
 4  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter3
 5  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter4
 6  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter5
 
 ========================
 Expression: /child::EXAMPLE/child::head/child::title
@@ -75,7 +90,22 @@ Expression: /descendant::p/ancestor::chapter
 Object is a Node Set :
 Set contains 5 nodes:
 1  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter1
 2  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter2
 3  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter3
 4  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter4
 5  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter5
diff --git a/result/XPath/tests/chaptersprefol b/result/XPath/tests/chaptersprefol
index 930bb7ab..6222eed9 100644
--- a/result/XPath/tests/chaptersprefol
+++ b/result/XPath/tests/chaptersprefol
@@ -26,6 +26,9 @@ Set contains 10 nodes:
 1  ELEMENT p
 2  ELEMENT title
 3  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter2
 4  ELEMENT p
 5  ELEMENT image
     ATTRIBUTE href
@@ -34,6 +37,9 @@ Set contains 10 nodes:
 6  ELEMENT p
 7  ELEMENT title
 8  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter1
 9  ELEMENT title
 10  ELEMENT head
 
@@ -42,9 +48,15 @@ Expression: /child::EXAMPLE/child::chapter[3]/following::*
 Object is a Node Set :
 Set contains 6 nodes:
 1  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter4
 2  ELEMENT title
 3  ELEMENT p
 4  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter5
 5  ELEMENT title
 6  ELEMENT p
 
@@ -63,14 +75,26 @@ Object is a Node Set :
 Set contains 13 nodes:
 1  ELEMENT p
 2  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter2
 3  ELEMENT title
 4  ELEMENT p
 5  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter3
 6  ELEMENT title
 7  ELEMENT p
 8  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter4
 9  ELEMENT title
 10  ELEMENT p
 11  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter5
 12  ELEMENT title
 13  ELEMENT p
diff --git a/result/XPath/tests/vidbase b/result/XPath/tests/vidbase
new file mode 100644
index 00000000..3c7b62fb
--- /dev/null
+++ b/result/XPath/tests/vidbase
@@ -0,0 +1,42 @@
+
+========================
+Expression: id('chapter1')
+Object is a Node Set :
+Set contains 1 nodes:
+1  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter1
+
+========================
+Expression: id('chapter3')
+Object is a Node Set :
+Set contains 1 nodes:
+1  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter3
+
+========================
+Expression: id('chapter1')/p
+Object is a Node Set :
+Set contains 4 nodes:
+1  ELEMENT p
+2  ELEMENT p
+3  ELEMENT p
+4  ELEMENT p
+
+========================
+Expression: id('chapter1')//p
+Object is a Node Set :
+Set contains 4 nodes:
+1  ELEMENT p
+2  ELEMENT p
+3  ELEMENT p
+4  ELEMENT p
+
+========================
+Expression: id('chapter1')/p[1]
+Object is a Node Set :
+Set contains 1 nodes:
+1  ELEMENT p
diff --git a/result/XPath/xptr/chapterschildseq b/result/XPath/xptr/chapterschildseq
new file mode 100644
index 00000000..ef49ee50
--- /dev/null
+++ b/result/XPath/xptr/chapterschildseq
@@ -0,0 +1,14 @@
+
+========================
+Expression: /1/2/3
+Object is a Node Set :
+Set contains 1 nodes:
+1  ELEMENT image
+    ATTRIBUTE href
+      TEXT
+        content=linus.gif
+
+========================
+Expression: chapter1/3
+Object is a Node Set :
+Set contains 0 nodes:
diff --git a/result/XPath/xptr/chaptersparts b/result/XPath/xptr/chaptersparts
new file mode 100644
index 00000000..70b561b3
--- /dev/null
+++ b/result/XPath/xptr/chaptersparts
@@ -0,0 +1,44 @@
+
+========================
+Expression: xpointer(//chapitre[2])
+Object is empty (NULL)
+
+========================
+Expression: xpointer(//chapter[2])
+Object is a Node Set :
+Set contains 1 nodes:
+1  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter2
+
+========================
+Expression: xpointer(//chapitre[2])xpointer(//chapter[2])
+Object is a Node Set :
+Set contains 1 nodes:
+1  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter2
+
+========================
+Expression: xpointer(id("chapter1"))
+Object is empty (NULL)
+
+========================
+Expression: xpointer(//*[@id="chapter1"])
+Object is a Node Set :
+Set contains 1 nodes:
+1  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter1
+
+========================
+Expression: xpointer(id("chapter1"))xpointer(//*[@id="chapter1"])
+Object is a Node Set :
+Set contains 1 nodes:
+1  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter1
diff --git a/result/XPath/xptr/chaptersrange b/result/XPath/xptr/chaptersrange
new file mode 100644
index 00000000..0b85ee78
--- /dev/null
+++ b/result/XPath/xptr/chaptersrange
@@ -0,0 +1,48 @@
+
+========================
+Expression: xpointer(//chapter[position() = 2]/range-to(following::chapter[1]))
+Object is a Location Set:
+1 :   Object is a range :
+  From node
+    ELEMENT chapter
+      ATTRIBUTE id
+        TEXT
+          content=chapter2
+  To node
+    ELEMENT chapter
+      ATTRIBUTE id
+        TEXT
+          content=chapter3
+
+
+========================
+Expression: xpointer(//chapter[position() <= 2]/range-to(following::chapter[1]))
+Object is a Location Set:
+1 :   Object is a range :
+  From node
+    ELEMENT chapter
+      ATTRIBUTE id
+        TEXT
+          content=chapter1
+  To node
+    ELEMENT chapter
+      ATTRIBUTE id
+        TEXT
+          content=chapter2
+
+2 :   Object is a range :
+  From node
+    ELEMENT chapter
+      ATTRIBUTE id
+        TEXT
+          content=chapter2
+  To node
+    ELEMENT chapter
+      ATTRIBUTE id
+        TEXT
+          content=chapter3
+
+
+========================
+Expression: xpointer(//chapter[position() = last()]/range-to(following::chapter[1]))
+Object is empty (NULL)
diff --git a/result/XPath/xptr/vidbase b/result/XPath/xptr/vidbase
new file mode 100644
index 00000000..8b9e92d6
--- /dev/null
+++ b/result/XPath/xptr/vidbase
@@ -0,0 +1,19 @@
+
+========================
+Expression: xpointer(id('chapter1')/p)
+Object is a Node Set :
+Set contains 4 nodes:
+1  ELEMENT p
+2  ELEMENT p
+3  ELEMENT p
+4  ELEMENT p
+
+========================
+Expression: xpointer(id('chapter1')/p[1]/range-to(following-sibling::p[2]))
+Object is a Location Set:
+1 :   Object is a range :
+  From node
+    ELEMENT p
+  To node
+    ELEMENT p
+
diff --git a/result/XPath/xptr/vidchildseq b/result/XPath/xptr/vidchildseq
new file mode 100644
index 00000000..f06bb148
--- /dev/null
+++ b/result/XPath/xptr/vidchildseq
@@ -0,0 +1,18 @@
+
+========================
+Expression: /1/2/3
+Object is a Node Set :
+Set contains 1 nodes:
+1  ELEMENT image
+    ATTRIBUTE href
+      TEXT
+        content=linus.gif
+
+========================
+Expression: chapter1/3
+Object is a Node Set :
+Set contains 1 nodes:
+1  ELEMENT image
+    ATTRIBUTE href
+      TEXT
+        content=linus.gif
diff --git a/result/XPath/xptr/vidparts b/result/XPath/xptr/vidparts
new file mode 100644
index 00000000..bd5bd3c1
--- /dev/null
+++ b/result/XPath/xptr/vidparts
@@ -0,0 +1,27 @@
+
+========================
+Expression: xpointer(id("chapter1"))
+Object is a Node Set :
+Set contains 1 nodes:
+1  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter1
+
+========================
+Expression: xpointer(//*[@id="chapter1"])
+Object is a Node Set :
+Set contains 1 nodes:
+1  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter1
+
+========================
+Expression: xpointer(id("chapter1"))xpointer(//*[@id="chapter1"])
+Object is a Node Set :
+Set contains 1 nodes:
+1  ELEMENT chapter
+    ATTRIBUTE id
+      TEXT
+        content=chapter1