From 4cd874e79f88f79a3782d4b7feea60b48ec26598 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Mon, 25 Feb 2013 06:18:29 +0000
Subject: Support most of the latest Turtle Editor's Draft.

git-svn-id: http://svn.drobilla.net/serd/trunk@418 490d8e77-9747-427b-9fa3-0b8f29cee8a0
---
 tests/good/test-07.nt            | 10 +++----
 tests/good/test-29.nt            |  1 -
 tests/good/test-29.ttl           |  1 -
 tests/good/test-backspace.nt     |  4 +--
 tests/good/test-blank-in-list.nt |  6 ++--
 tests/good/test-escapes.ttl      |  2 +-
 tests/good/test-list-in-blank.nt | 10 +++----
 tests/good/test-list-subject.nt  | 10 +++----
 tests/good/test-pretty.nt        | 64 ++++++++++++++++++++--------------------
 tests/good/test-uri-escape.nt    |  1 +
 tests/good/test-uri-escape.ttl   |  1 +
 11 files changed, 55 insertions(+), 55 deletions(-)
 delete mode 100644 tests/good/test-29.nt
 delete mode 100644 tests/good/test-29.ttl
 create mode 100644 tests/good/test-uri-escape.nt
 create mode 100644 tests/good/test-uri-escape.ttl

(limited to 'tests/good')

diff --git a/tests/good/test-07.nt b/tests/good/test-07.nt
index 923f26a4..e62cede5 100644
--- a/tests/good/test-07.nt
+++ b/tests/good/test-07.nt
@@ -1,5 +1,5 @@
-<http://example.org/stuff/1.0/a> <http://example.org/stuff/1.0/b> _:el1 .
-_:el1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "apple" .
-_:el1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:el2 .
-_:el2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "banana" .
-_:el2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+<http://example.org/stuff/1.0/a> <http://example.org/stuff/1.0/b> _:b1 .
+_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "apple" .
+_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:b2 .
+_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "banana" .
+_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
diff --git a/tests/good/test-29.nt b/tests/good/test-29.nt
deleted file mode 100644
index 612052d3..00000000
--- a/tests/good/test-29.nt
+++ /dev/null
@@ -1 +0,0 @@
-<http://example.org/node> <http://example.org/prop> <scheme:\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\t\n\u000B\u000C\r\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F !"#$%&'()*+,-./0123456789:/<=\u003E?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u007F> .
diff --git a/tests/good/test-29.ttl b/tests/good/test-29.ttl
deleted file mode 100644
index 612052d3..00000000
--- a/tests/good/test-29.ttl
+++ /dev/null
@@ -1 +0,0 @@
-<http://example.org/node> <http://example.org/prop> <scheme:\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\t\n\u000B\u000C\r\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F !"#$%&'()*+,-./0123456789:/<=\u003E?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_`abcdefghijklmnopqrstuvwxyz{|}~\u007F> .
diff --git a/tests/good/test-backspace.nt b/tests/good/test-backspace.nt
index ad4806cf..3a88c436 100644
--- a/tests/good/test-backspace.nt
+++ b/tests/good/test-backspace.nt
@@ -1,2 +1,2 @@
-<http://example.org/thing> <http://example.org/label> "\u0008" .
-<http://example.org/thing> <http://example.org/label> "\uFFFD" .
+<http://example.org/thing> <http://example.org/label> "\b" .
+<http://example.org/thing> <http://example.org/label> "\b" .
diff --git a/tests/good/test-blank-in-list.nt b/tests/good/test-blank-in-list.nt
index 253087e7..36bac6d7 100644
--- a/tests/good/test-blank-in-list.nt
+++ b/tests/good/test-blank-in-list.nt
@@ -1,4 +1,4 @@
-<http://example.org/stuff/1.0/a> <http://example.org/stuff/1.0/b> _:el1 .
-_:el1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> _:b2 .
+<http://example.org/stuff/1.0/a> <http://example.org/stuff/1.0/b> _:b1 .
+_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> _:b2 .
 _:b2 <http://example.org/stuff/1.0/c> <http://example.org/stuff/1.0/d> .
-_:el1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
diff --git a/tests/good/test-escapes.ttl b/tests/good/test-escapes.ttl
index ff306b15..9898e883 100644
--- a/tests/good/test-escapes.ttl
+++ b/tests/good/test-escapes.ttl
@@ -1,2 +1,2 @@
 <http://example.org/thing> <http://example.org/comment> "\\\r\n\t" .
-<http://example.org/thing> <http://example.org/comment> <http://example.org/\>> .
\ No newline at end of file
+<http://example.org/thing> <http://example.org/comment> <http://example.org/\u003E> .
\ No newline at end of file
diff --git a/tests/good/test-list-in-blank.nt b/tests/good/test-list-in-blank.nt
index b7f631da..108363f2 100644
--- a/tests/good/test-list-in-blank.nt
+++ b/tests/good/test-list-in-blank.nt
@@ -1,6 +1,6 @@
 <http://example.org/stuff/1.0/a> <http://example.org/stuff/1.0/b> _:b1 .
-_:b1 <http://example.org/stuff/1.0/c> _:el2 .
-_:el2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "apple" .
-_:el2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:el3 .
-_:el3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "banana" .
-_:el3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+_:b1 <http://example.org/stuff/1.0/c> _:b2 .
+_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "apple" .
+_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:b3 .
+_:b3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "banana" .
+_:b3 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
diff --git a/tests/good/test-list-subject.nt b/tests/good/test-list-subject.nt
index ef87b0f2..e4f9c40c 100644
--- a/tests/good/test-list-subject.nt
+++ b/tests/good/test-list-subject.nt
@@ -1,6 +1,6 @@
 <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/List> .
-_:el1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "apple" .
-_:el1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:el2 .
-_:el2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "banana" .
-_:el2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
-_:el1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/List> .
+_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "apple" .
+_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:b2 .
+_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "banana" .
+_:b2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+_:b1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/List> .
diff --git a/tests/good/test-pretty.nt b/tests/good/test-pretty.nt
index f96a10e2..9251563a 100644
--- a/tests/good/test-pretty.nt
+++ b/tests/good/test-pretty.nt
@@ -2,33 +2,33 @@
 _:b1 <http://example.org/isA> <http://example.org/Blank> .
 <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> <http://example.org/sameAs> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
 _:b2 <http://example.org/sameAs> _:b3 .
-_:el4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "apple" .
-_:el4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:el5 .
-_:el5 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "banana" .
-_:el5 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:el6 .
-_:el6 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "pear" .
-_:el6 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
-_:el4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/List> .
-_:el7 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> _:el8 .
-_:el8 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://example.org/a> .
-_:el8 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:el9 .
-_:el9 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://example.org/b> .
-_:el9 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
-_:el7 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:el10 .
-_:el10 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> _:el11 .
-_:el11 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://example.org/c> .
-_:el11 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:el12 .
-_:el12 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://example.org/d> .
-_:el12 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
-_:el10 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
-_:el7 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/List> .
-_:b13 <http://example.org/list> _:el14 .
-_:el14 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "apple" .
-_:el14 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:el15 .
-_:el15 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "banana" .
-_:el15 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:el16 .
-_:el16 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "pear" .
-_:el16 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+_:b4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "apple" .
+_:b4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:b5 .
+_:b5 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "banana" .
+_:b5 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:b6 .
+_:b6 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "pear" .
+_:b6 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+_:b4 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/List> .
+_:b7 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> _:b8 .
+_:b8 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://example.org/a> .
+_:b8 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:b9 .
+_:b9 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://example.org/b> .
+_:b9 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+_:b7 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:b10 .
+_:b10 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> _:b11 .
+_:b11 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://example.org/c> .
+_:b11 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:b12 .
+_:b12 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> <http://example.org/d> .
+_:b12 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+_:b10 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+_:b7 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/List> .
+_:b13 <http://example.org/list> _:b14 .
+_:b14 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "apple" .
+_:b14 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:b15 .
+_:b15 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "banana" .
+_:b15 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:b16 .
+_:b16 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> "pear" .
+_:b16 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
 _:b17 <http://example.org/a> <http://example.org/b> .
 _:b17 <http://example.org/a> <http://example.org/c> .
 _:b17 <http://example.org/a> <http://example.org/d> .
@@ -37,10 +37,10 @@ _:b19 <http://example.org/b> <http://example.org/c> .
 _:b19 <http://example.org/d> <http://example.org/e> .
 _:b18 <http://example.org/a> _:b20 .
 _:b20 <http://example.org/f> <http://example.org/g> .
-_:b21 <http://example.org/list> _:el22 .
-_:el22 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> _:b23 .
+_:b21 <http://example.org/list> _:b22 .
+_:b22 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> _:b23 .
 _:b23 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Apple> .
-_:el22 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:el24 .
-_:el24 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> _:b25 .
+_:b22 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> _:b24 .
+_:b24 <http://www.w3.org/1999/02/22-rdf-syntax-ns#first> _:b25 .
 _:b25 <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://example.org/Banana> .
-_:el24 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
+_:b24 <http://www.w3.org/1999/02/22-rdf-syntax-ns#rest> <http://www.w3.org/1999/02/22-rdf-syntax-ns#nil> .
diff --git a/tests/good/test-uri-escape.nt b/tests/good/test-uri-escape.nt
new file mode 100644
index 00000000..bdb27185
--- /dev/null
+++ b/tests/good/test-uri-escape.nt
@@ -0,0 +1 @@
+<http://example.org/node> <http://example.org/prop> <scheme:\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u000B\u000C\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F\u0020!\u0022#$%&'()*+,-./0123456789:/\u003C=\u003E?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\u005C]\u005E_\u0060abcdefghijklmnopqrstuvwxyz\u007B\u007C\u007D~\u007F> .
diff --git a/tests/good/test-uri-escape.ttl b/tests/good/test-uri-escape.ttl
new file mode 100644
index 00000000..bdb27185
--- /dev/null
+++ b/tests/good/test-uri-escape.ttl
@@ -0,0 +1 @@
+<http://example.org/node> <http://example.org/prop> <scheme:\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u000B\u000C\u000E\u000F\u0010\u0011\u0012\u0013\u0014\u0015\u0016\u0017\u0018\u0019\u001A\u001B\u001C\u001D\u001E\u001F\u0020!\u0022#$%&'()*+,-./0123456789:/\u003C=\u003E?@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\u005C]\u005E_\u0060abcdefghijklmnopqrstuvwxyz\u007B\u007C\u007D~\u007F> .
-- 
cgit v1.2.1