Update TriG tests with to match Turtle.

gkellogg · gkellogg · commit f18eb54d7976 · 2025-05-08T06:52:43.000-07:00
diff --git a/rdf/rdf12/rdf-trig/eval/manifest.ttl b/rdf/rdf12/rdf-trig/eval/manifest.ttl
@@ -28,30 +28,47 @@ trs:manifest  rdf:type mf:Manifest ;
     (
         trs:trig-star-1
         trs:trig-star-2
+        trs:trig-star-3
+        trs:trig-star-4
         trs:trig-star-bnode-1
         trs:trig-star-bnode-2
         trs:trig-star-annotation-1
         trs:trig-star-annotation-2
         trs:trig-star-annotation-3
         trs:trig-star-annotation-4
         trs:trig-star-annotation-5
+        trs:trig-star-annotation-6
+        trs:trig-star-annotation-7
+        trs:trig-star-annotation-8
         trs:trig-star-quoted-annotation-1
         trs:trig-star-quoted-annotation-2
         trs:trig-star-quoted-annotation-3
     ) .
 
 trs:trig-star-1 rdf:type rdft:TestTrigEval ;
-   mf:name      "TriG-star - subject quoted triple" ;
+   mf:name      "TriG-star - subject reification" ;
    mf:action    <trig-star-eval-01.trig> ;
    mf:result    <trig-star-eval-01.nq> ;
    .
 
 trs:trig-star-2 rdf:type rdft:TestTrigEval ;
-   mf:name      "TriG-star - object quoted triple" ;
+   mf:name      "TriG-star - object reification" ;
    mf:action    <trig-star-eval-02.trig> ;
    mf:result    <trig-star-eval-02.nq> ;
    .
 
+trs:trig-star-3 rdf:type rdft:TestTrigEval ;
+   mf:name      "TriG-star - subject reification with identifier" ;
+   mf:action    <trig-star-eval-03.trig> ;
+   mf:result    <trig-star-eval-03.nq> ;
+   .
+
+trs:trig-star-4 rdf:type rdft:TestTrigEval ;
+   mf:name      "TriG-star - object reification with identifier" ;
+   mf:action    <trig-star-eval-04.trig> ;
+   mf:result    <trig-star-eval-04.nq> ;
+   .
+
 trs:trig-star-bnode-1 rdf:type rdft:TestTrigEval ;
    mf:name      "TriG-star - blank node label" ;
    mf:action    <trig-star-eval-bnode-1.trig> ;
@@ -94,6 +111,24 @@ trs:trig-star-annotation-5 rdf:type rdft:TestTrigEval ;
    mf:result    <trig-star-eval-annotation-5.nq> ;
    .
 
+trs:trig-star-annotation-6 rdf:type rdft:TestTrigEval ;
+   mf:name      "TriG-star - Annotation with identifier" ;
+   mf:action    <trig-star-eval-annotation-6.trig> ;
+   mf:result    <trig-star-eval-annotation-6.nq> ;
+   .
+
+trs:trig-star-annotation-7 rdf:type rdft:TestTrigEval ;
+   mf:name      "TriG-star - Different annotations have different default identifiers" ;
+   mf:action    <trig-star-eval-annotation-7.trig> ;
+   mf:result    <trig-star-eval-annotation-7.nq> ;
+   .
+
+trs:trig-star-annotation-8 rdf:type rdft:TestTrigEval ;
+   mf:name      "TriG-star - Annotation form with explicit identifier" ;
+   mf:action    <trig-star-eval-annotation-8.trig> ;
+   mf:result    <trig-star-eval-annotation-8.nq> ;
+   .
+
 trs:trig-star-quoted-annotation-1 rdf:type rdft:TestTrigEval ;
    mf:name      "TriG-star - Annotation with quoting" ;
    mf:action    <trig-star-eval-quoted-annotation-1.trig> ;
diff --git a/rdf/rdf12/rdf-trig/eval/trig-star-eval-01.nq b/rdf/rdf12/rdf-trig/eval/trig-star-eval-01.nq
@@ -1 +1,2 @@
-<< <http://example/s> <http://example/p> <http://example/o> >> <http://example/q> <http://example/z> <http://example/G> .
+_:anon <http://example/q> <http://example/z> <http://example/G> .
+_:anon <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example/s> <http://example/p> <http://example/o> )>> <http://example/G> .
diff --git a/rdf/rdf12/rdf-trig/eval/trig-star-eval-02.nq b/rdf/rdf12/rdf-trig/eval/trig-star-eval-02.nq
@@ -1 +1,2 @@
-<http://example/a> <http://example/q> << <http://example/s> <http://example/p> <http://example/o> >> <http://example/G> .
+<http://example/a> <http://example/q> _:anon <http://example/G> .
+_:anon <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example/s> <http://example/p> <http://example/o> )>> <http://example/G> .
diff --git a/rdf/rdf12/rdf-trig/eval/trig-star-eval-03.nq b/rdf/rdf12/rdf-trig/eval/trig-star-eval-03.nq
@@ -0,0 +1,2 @@
+<http://example/i> <http://example/q> <http://example/z> <http://example/G> .
+<http://example/i> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example/s> <http://example/p> <http://example/o> )>> <http://example/G> .
diff --git a/rdf/rdf12/rdf-trig/eval/trig-star-eval-03.trig b/rdf/rdf12/rdf-trig/eval/trig-star-eval-03.trig
@@ -0,0 +1,3 @@
+PREFIX : <http://example/>
+
+:G {<< :s :p :o ~ :i >> :q :z .}
diff --git a/rdf/rdf12/rdf-trig/eval/trig-star-eval-04.nq b/rdf/rdf12/rdf-trig/eval/trig-star-eval-04.nq
@@ -0,0 +1,2 @@
+<http://example/a> <http://example/q> <http://example/i> <http://example/G> .
+<http://example/i> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example/s> <http://example/p> <http://example/o> )>> <http://example/G> .
diff --git a/rdf/rdf12/rdf-trig/eval/trig-star-eval-04.trig b/rdf/rdf12/rdf-trig/eval/trig-star-eval-04.trig
@@ -0,0 +1,3 @@
+PREFIX : <http://example/>
+
+:G {:a :q << :s :p :o ~ :i >> .}
diff --git a/rdf/rdf12/rdf-trig/eval/trig-star-eval-annotation-1.nq b/rdf/rdf12/rdf-trig/eval/trig-star-eval-annotation-1.nq
@@ -1,2 +1,3 @@
 <http://example/s> <http://example/p> <http://example/o> <http://example/G> .
-<< <http://example/s> <http://example/p> <http://example/o> >> <http://example/r> <http://example/z> <http://example/G> .
+_:anon <http://example/r> <http://example/z> <http://example/G> .
+_:anon <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example/s> <http://example/p> <http://example/o> )>> <http://example/G> .
diff --git a/rdf/rdf12/rdf-trig/eval/trig-star-eval-annotation-2.nq b/rdf/rdf12/rdf-trig/eval/trig-star-eval-annotation-2.nq
@@ -1,7 +1,8 @@
 <http://example/s> <http://example/p> <http://example/o> <http://example/G> .
-_:b1 <http://example/graph> <http://host1/> <http://example/G> .
-_:b1 <http://example/date> "2020-01-20"^^<http://www.w3.org/2001/XMLSchema#date> <http://example/G> .
-<< <http://example/s> <http://example/p> <http://example/o> >> <http://example/source> _:b1 <http://example/G> .
-_:b2 <http://example/graph> <http://host2/> <http://example/G> .
-_:b2 <http://example/date> "2020-12-31"^^<http://www.w3.org/2001/XMLSchema#date> <http://example/G> .
-<< <http://example/s> <http://example/p> <http://example/o> >> <http://example/source> _:b2 <http://example/G> .
+_:anon <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<http://example/s> <http://example/p> <http://example/o>)>> <http://example/G> .
+_:anon <http://example/source> _:bpl0 <http://example/G> .
+_:anon <http://example/source> _:bpl1 <http://example/G> .
+_:bpl0 <http://example/graph> <http://host1/> <http://example/G> .
+_:bpl0 <http://example/date> "2020-01-20"^^<http://www.w3.org/2001/XMLSchema#date> <http://example/G> .
+_:bpl1 <http://example/graph> <http://host2/> <http://example/G> .
+_:bpl1 <http://example/date> "2020-12-31"^^<http://www.w3.org/2001/XMLSchema#date> <http://example/G> .
diff --git a/rdf/rdf12/rdf-trig/eval/trig-star-eval-annotation-3.nq b/rdf/rdf12/rdf-trig/eval/trig-star-eval-annotation-3.nq
@@ -1,6 +1,9 @@
 <http://example/s> <http://example/p> <http://example/o> <http://example/G> .
-<< <http://example/s> <http://example/p> <http://example/o> >> <http://example/a> <http://example/b> <http://example/G> .
 <http://example/s> <http://example/p2> <http://example/o2> <http://example/G> .
-<< <http://example/s> <http://example/p2> <http://example/o2> >> <http://example/a2> <http://example/b2> <http://example/G> .
 <http://example/s> <http://example/p2> <http://example/o3> <http://example/G> .
-<< <http://example/s> <http://example/p2> <http://example/o3> >> <http://example/a3> <http://example/b3> <http://example/G> .
+_:a0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<http://example/s> <http://example/p> <http://example/o>)>> <http://example/G> .
+_:a0 <http://example/a> <http://example/b> <http://example/G> .
+_:a1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<http://example/s> <http://example/p2> <http://example/o2>)>> <http://example/G> .
+_:a1 <http://example/a2> <http://example/b2> <http://example/G> .
+_:a2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<http://example/s> <http://example/p2> <http://example/o3>)>> <http://example/G> .
+_:a2 <http://example/a3> <http://example/b3> <http://example/G> .
diff --git a/rdf/rdf12/rdf-trig/eval/trig-star-eval-annotation-4.nq b/rdf/rdf12/rdf-trig/eval/trig-star-eval-annotation-4.nq
@@ -1,3 +1,5 @@
 <http://example/s> <http://example/p> <http://example/o> <http://example/G> .
-<< <http://example/s> <http://example/p> <http://example/o> >> <http://example/a> <http://example/b> <http://example/G> .
-<< << <http://example/s> <http://example/p> <http://example/o> >> <http://example/a> <http://example/b> >> <http://example/a2> <http://example/b2> <http://example/G> .
+_:a0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<http://example/s> <http://example/p> <http://example/o>)>> <http://example/G> .
+_:a0 <http://example/a> <http://example/b> <http://example/G> .
+_:a1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(_:a0 <http://example/a> <http://example/b>)>> <http://example/G> .
+_:a1 <http://example/a2> <http://example/b2> <http://example/G> .
diff --git a/rdf/rdf12/rdf-trig/eval/trig-star-eval-annotation-5.nq b/rdf/rdf12/rdf-trig/eval/trig-star-eval-annotation-5.nq
@@ -1,3 +1,4 @@
 <http://example/s> <http://example/p> <http://example/o1> <http://example/G> .
 <http://example/s> <http://example/p> <http://example/o2> <http://example/G> .
-<< <http://example/s> <http://example/p> <http://example/o2> >> <http://example/a> <http://example/b> <http://example/G> .
+_:anon <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<http://example/s> <http://example/p> <http://example/o2>)>> <http://example/G> .
+_:anon <http://example/a> <http://example/b> <http://example/G> .
diff --git a/rdf/rdf12/rdf-trig/eval/trig-star-eval-annotation-6.nq b/rdf/rdf12/rdf-trig/eval/trig-star-eval-annotation-6.nq
@@ -0,0 +1,3 @@
+<http://example/s> <http://example/p> <http://example/o> <http://example/G> .
+<http://example/i> <http://example/r> <http://example/z> <http://example/G> .
+<http://example/i> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example/s> <http://example/p> <http://example/o> )>> <http://example/G> .
diff --git a/rdf/rdf12/rdf-trig/eval/trig-star-eval-annotation-6.trig b/rdf/rdf12/rdf-trig/eval/trig-star-eval-annotation-6.trig
@@ -0,0 +1,3 @@
+PREFIX : <http://example/>
+
+:G {:s :p :o ~ :i {| :r :z |} .}
diff --git a/rdf/rdf12/rdf-trig/eval/trig-star-eval-annotation-7.nq b/rdf/rdf12/rdf-trig/eval/trig-star-eval-annotation-7.nq
@@ -0,0 +1,5 @@
+<http://example/s> <http://example/p> <http://example/o> <http://example/G> .
+_:anno1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<http://example/s> <http://example/p> <http://example/o>)>> <http://example/G> .
+_:anno1 <http://example/r> <http://example/s> <http://example/G> .
+_:anno2 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<http://example/s> <http://example/p> <http://example/o>)>> <http://example/G> .
+_:anno2 <http://example/t> <http://example/u> <http://example/G> .
diff --git a/rdf/rdf12/rdf-trig/eval/trig-star-eval-annotation-7.trig b/rdf/rdf12/rdf-trig/eval/trig-star-eval-annotation-7.trig
@@ -0,0 +1,6 @@
+PREFIX : <http://example/>
+
+:G {
+  :s :p :o {|:r :s |} .
+  :s :p :o {|:t :u |} .
+}
diff --git a/rdf/rdf12/rdf-trig/eval/trig-star-eval-annotation-8.nq b/rdf/rdf12/rdf-trig/eval/trig-star-eval-annotation-8.nq
@@ -0,0 +1,3 @@
+<http://example/s> <http://example/p> <http://example/o> <http://example/G> .
+<http://example/i> <http://example/r> <http://example/z> <http://example/G> .
+<http://example/i> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example/s> <http://example/p> <http://example/o> )>> <http://example/G> .
diff --git a/rdf/rdf12/rdf-trig/eval/trig-star-eval-annotation-8.trig b/rdf/rdf12/rdf-trig/eval/trig-star-eval-annotation-8.trig
@@ -0,0 +1,3 @@
+PREFIX : <http://example/>
+
+:G {:s :p :o ~ :i {| :r :z |} .}
diff --git a/rdf/rdf12/rdf-trig/eval/trig-star-eval-bnode-1.nq b/rdf/rdf12/rdf-trig/eval/trig-star-eval-bnode-1.nq
@@ -1,2 +1,3 @@
 _:b9 <http://example/p> <http://example/o> <http://example/G> .
-<< _:b9 <http://example/p> <http://example/o> >> <http://example/q> <http://example/z> <http://example/G> .
+_:anon <http://example/q> <http://example/z> <http://example/G> .
+_:anon <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( _:b9 <http://example/p> <http://example/o> )>> <http://example/G> .
diff --git a/rdf/rdf12/rdf-trig/eval/trig-star-eval-bnode-2.nq b/rdf/rdf12/rdf-trig/eval/trig-star-eval-bnode-2.nq
@@ -1,2 +1,4 @@
 _:label1 <http://example/p1> _:label1 <http://example/G> .
-<< _:label1 <http://example/p1> _:label1 >> <http://example/q> << _:label1 <http://example/p2> <http://example/o> >> <http://example/G> .
+_:a0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(_:label1 <http://example/p1> _:label1)>> <http://example/G> .
+_:a0 <http://example/q> _:a1 <http://example/G> .
+_:a1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(_:label1 <http://example/p2> <http://example/o>)>> <http://example/G> .
diff --git a/rdf/rdf12/rdf-trig/eval/trig-star-eval-quoted-annotation-1.nq b/rdf/rdf12/rdf-trig/eval/trig-star-eval-quoted-annotation-1.nq
@@ -1,2 +1,4 @@
 <http://example/s> <http://example/p> <http://example/o> <http://example/G> .
-<<<http://example/s> <http://example/p> <http://example/o>>> <http://example/r> <<<http://example/s1> <http://example/p1> <http://example/o1>>> <http://example/G> .
+_:a0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<http://example/s> <http://example/p> <http://example/o>)>> <http://example/G> .
+_:a0 <http://example/r> _:a1 <http://example/G> .
+_:a1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<http://example/s1> <http://example/p1> <http://example/o1>)>> <http://example/G> .
diff --git a/rdf/rdf12/rdf-trig/eval/trig-star-eval-quoted-annotation-2.nq b/rdf/rdf12/rdf-trig/eval/trig-star-eval-quoted-annotation-2.nq
@@ -1,2 +1,4 @@
-<<<http://example/s1> <http://example/p1> <http://example/o1>>> <http://example/p> <http://example/o> <http://example/G> .
-<<<<<http://example/s1> <http://example/p1> <http://example/o1>>> <http://example/p> <http://example/o>>> <http://example/r> <http://example/z> <http://example/G> .
+_:a0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<http://example/s1> <http://example/p1> <http://example/o1>)>> <http://example/G> .
+_:a0 <http://example/p> <http://example/o> <http://example/G> .
+_:a1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(_:a0 <http://example/p> <http://example/o>)>> <http://example/G> .
+_:a1 <http://example/r> <http://example/z> <http://example/G> .
diff --git a/rdf/rdf12/rdf-trig/eval/trig-star-eval-quoted-annotation-3.nq b/rdf/rdf12/rdf-trig/eval/trig-star-eval-quoted-annotation-3.nq
@@ -1,2 +1,4 @@
-<http://example/s> <http://example/p> <<<http://example/s2> <http://example/p2> <http://example/o2>>> <http://example/G> .
-<<<http://example/s> <http://example/p> <<<http://example/s2> <http://example/p2> <http://example/o2>>>>> <http://example/r> <http://example/z> <http://example/G> .
+_:a0 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<http://example/s2> <http://example/p2> <http://example/o2>)>> <http://example/G> .
+<http://example/s> <http://example/p> _:a0 <http://example/G> .
+_:a1 <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<(<http://example/s> <http://example/p> _:a0)>> <http://example/G> .
+_:a1 <http://example/r> <http://example/z> <http://example/G> .
diff --git a/rdf/rdf12/rdf-trig/syntax/manifest.ttl b/rdf/rdf12/rdf-trig/syntax/manifest.ttl
@@ -27,9 +27,13 @@ trs:manifest  rdf:type mf:Manifest ;
     (
         trs:trig-star-1
         trs:trig-star-2
+        trs:trig-star-3
+        trs:trig-star-4
 
         trs:trig-star-inside-1
         trs:trig-star-inside-2
+        trs:trig-star-inside-3
+        trs:trig-star-inside-4
 
         trs:trig-star-nested-1
         trs:trig-star-nested-2
@@ -47,10 +51,15 @@ trs:manifest  rdf:type mf:Manifest ;
         trs:trig-star-bad-5
         trs:trig-star-bad-6
         trs:trig-star-bad-7
-        trs:trig-star-bad-8
 
         trs:trig-star-ann-1
         trs:trig-star-ann-2
+        trs:trig-star-ann-3
+        trs:trig-star-ann-4
+        trs:trig-star-ann-5
+        trs:trig-star-ann-6
+        trs:trig-star-ann-7
+        trs:trig-star-ann-8
 
         trs:trig-star-bad-ann-1
         trs:trig-star-bad-ann-2
@@ -67,25 +76,45 @@ trs:manifest  rdf:type mf:Manifest ;
 ## Good Syntax
 
 trs:trig-star-1 rdf:type rdft:TestTrigPositiveSyntax ;
-   mf:name      "TriG-star - subject quoted triple" ;
+   mf:name      "TriG-star - subject reified triple" ;
    mf:action    <trig-star-syntax-basic-01.trig> ;
    .
 
 trs:trig-star-2 rdf:type rdft:TestTrigPositiveSyntax ;
-   mf:name      "TriG-star - object quoted triple" ;
+   mf:name      "TriG-star - object reified triple" ;
    mf:action    <trig-star-syntax-basic-02.trig> ;
    .
 
+trs:trig-star-3 rdf:type rdft:TestTrigPositiveSyntax ;
+   mf:name      "TriG-star - triple term object" ;
+   mf:action    <trig-star-syntax-basic-03.trig> ;
+   .
+
+trs:trig-star-4 rdf:type rdft:TestTrigPositiveSyntax ;
+    mf:name      "TriG-star - reified triple outside triple" ;
+    mf:action    <trig-star-syntax-basic-04.trig> ;
+    .
+
 trs:trig-star-inside-1 rdf:type rdft:TestTrigPositiveSyntax ;
-   mf:name      "TriG-star - quoted triple inside blankNodePropertyList" ;
+   mf:name      "TriG-star - reified triple inside blankNodePropertyList" ;
    mf:action    <trig-star-syntax-inside-01.trig> ;
    .
 
 trs:trig-star-inside-2 rdf:type rdft:TestTrigPositiveSyntax ;
-   mf:name      "TriG-star - quoted triple inside collection" ;
+   mf:name      "TriG-star - reified triple inside collection" ;
    mf:action    <trig-star-syntax-inside-02.trig> ;
    .
 
+trs:trig-star-inside-3 rdf:type rdft:TestTrigPositiveSyntax ;
+   mf:name      "TriG-star - reified triple with IRI identifier" ;
+   mf:action    <trig-star-syntax-inside-03.trig> ;
+   .
+
+trs:trig-star-inside-4 rdf:type rdft:TestTrigPositiveSyntax ;
+   mf:name      "TriG-star - reified triple with blank node identifier" ;
+   mf:action    <trig-star-syntax-inside-04.trig> ;
+   .
+
 trs:trig-star-nested-1 rdf:type rdft:TestTrigPositiveSyntax ;
    mf:name      "TriG-star - nested quoted triple, subject position" ;
    mf:action    <trig-star-syntax-nested-01.trig> ;
@@ -119,45 +148,40 @@ trs:trig-star-bnode-3 rdf:type rdft:TestTrigPositiveSyntax ;
 ## Bad Syntax
 
 trs:trig-star-bad-1 rdf:type rdft:TestTrigNegativeSyntax ;
-    mf:name      "TriG-star - bad - quoted triple as predicate" ;
+    mf:name      "TriG-star - bad - reified triple as predicate" ;
     mf:action    <trig-star-syntax-bad-01.trig> ;
     .
 
 trs:trig-star-bad-2 rdf:type rdft:TestTrigNegativeSyntax ;
-    mf:name      "TriG-star - bad - quoted triple outside triple" ;
+    mf:name      "TriG-star - bad - literal in subject position of reified triple" ;
     mf:action    <trig-star-syntax-bad-02.trig> ;
     .
 
 trs:trig-star-bad-3 rdf:type rdft:TestTrigNegativeSyntax ;
-    mf:name      "TriG-star - bad - collection list in quoted triple" ;
+    mf:name      "TriG-star - bad - blank node  as predicate in reified triple" ;
     mf:action    <trig-star-syntax-bad-03.trig> ;
     .
 
 trs:trig-star-bad-4 rdf:type rdft:TestTrigNegativeSyntax ;
-    mf:name      "TriG-star - bad - literal in subject position of quoted triple" ;
+    mf:name      "TriG-star - bad - incomplete reified triple" ;
     mf:action    <trig-star-syntax-bad-04.trig> ;
     .
 
 trs:trig-star-bad-5 rdf:type rdft:TestTrigNegativeSyntax ;
-    mf:name      "TriG-star - bad - blank node  as predicate in quoted triple";
+    mf:name      "TriG-star - bad - over-long reified triple";
     mf:action    <trig-star-syntax-bad-05.trig> ;
     .
 
 trs:trig-star-bad-6 rdf:type rdft:TestTrigNegativeSyntax ;
-    mf:name      "TriG-star - bad - compound blank node expression";
+    mf:name      "TriG-star - bad - reified with list object";
     mf:action    <trig-star-syntax-bad-06.trig> ;
     .
 
 trs:trig-star-bad-7 rdf:type rdft:TestTrigNegativeSyntax ;
-    mf:name      "TriG-star - bad - incomplete quoted triple";
+    mf:name      "TriG-star - bad - compound blank node expression";
     mf:action    <trig-star-syntax-bad-07.trig> ;
     .
 
-trs:trig-star-bad-8 rdf:type rdft:TestTrigNegativeSyntax ;
-    mf:name      "TriG-star - bad - over-long quoted triple";
-    mf:action    <trig-star-syntax-bad-08.trig> ;
-    .
-
 ## Annotation syntax
 
 trs:trig-star-ann-1 rdf:type rdft:TestTrigPositiveSyntax ;
@@ -170,6 +194,36 @@ trs:trig-star-ann-2 rdf:type rdft:TestTrigPositiveSyntax ;
     mf:action    <trig-star-annotation-2.trig> ;
     .
 
+trs:trig-star-ann-3 rdf:type rdft:TestTrigPositiveSyntax ;
+    mf:name      "TriG-star - Annotation predicateObjecetList" ;
+    mf:action    <trig-star-annotation-3.trig> ;
+    .
+
+trs:trig-star-ann-4 rdf:type rdft:TestTrigPositiveSyntax ;
+    mf:name      "TriG-star - Annotation followed by predicate/object" ;
+    mf:action    <trig-star-annotation-4.trig> ;
+    .
+
+trs:trig-star-ann-5 rdf:type rdft:TestTrigPositiveSyntax ;
+    mf:name      "TriG-star - Reifier without annotation block" ;
+    mf:action    <trig-star-annotation-5.trig> ;
+    .
+
+trs:trig-star-ann-6 rdf:type rdft:TestTrigPositiveSyntax ;
+    mf:name      "TriG-star - Empty reifier without annotation block" ;
+    mf:action    <trig-star-annotation-6.trig> ;
+    .
+
+trs:trig-star-ann-7 rdf:type rdft:TestTrigPositiveSyntax ;
+    mf:name      "TriG-star - Reifier with annotation block" ;
+    mf:action    <trig-star-annotation-7.trig> ;
+    .
+
+trs:trig-star-ann-8 rdf:type rdft:TestTrigPositiveSyntax ;
+    mf:name      "TriG-star - Empty reifier with annotation block" ;
+    mf:action    <trig-star-annotation-8.trig> ;
+    .
+
 ## Bad annotation syntax
 
 trs:trig-star-bad-ann-1 rdf:type rdft:TestTrigNegativeSyntax ;
diff --git a/rdf/rdf12/rdf-trig/syntax/trig-star-annotation-3.trig b/rdf/rdf12/rdf-trig/syntax/trig-star-annotation-3.trig
@@ -0,0 +1,3 @@
+PREFIX : <http://example/>
+
+:G {:s :p :o {| :q1 :r1 ; :q2 :r2 ; |} .}
diff --git a/rdf/rdf12/rdf-trig/syntax/trig-star-annotation-4.trig b/rdf/rdf12/rdf-trig/syntax/trig-star-annotation-4.trig
@@ -0,0 +1,3 @@
+PREFIX : <http://example/>
+
+:G {:s :p :o {| :x :y |} ; :q :r .}
diff --git a/rdf/rdf12/rdf-trig/syntax/trig-star-annotation-5.trig b/rdf/rdf12/rdf-trig/syntax/trig-star-annotation-5.trig
@@ -0,0 +1,3 @@
+PREFIX : <http://example/>
+
+:G {:s :p :o ~:e .}
diff --git a/rdf/rdf12/rdf-trig/syntax/trig-star-annotation-6.trig b/rdf/rdf12/rdf-trig/syntax/trig-star-annotation-6.trig
@@ -0,0 +1,3 @@
+PREFIX : <http://example/>
+
+:G {:s :p :o ~ .}
diff --git a/rdf/rdf12/rdf-trig/syntax/trig-star-annotation-7.trig b/rdf/rdf12/rdf-trig/syntax/trig-star-annotation-7.trig
@@ -0,0 +1,3 @@
+PREFIX : <http://example/>
+
+:G {:s :p :o ~:e {| :q :r |} .}
diff --git a/rdf/rdf12/rdf-trig/syntax/trig-star-annotation-8.trig b/rdf/rdf12/rdf-trig/syntax/trig-star-annotation-8.trig
@@ -0,0 +1,3 @@
+PREFIX : <http://example/>
+
+:G {:s :p :o ~ {| :q :r |} .}
diff --git a/rdf/rdf12/rdf-trig/syntax/trig-star-syntax-bad-02.trig b/rdf/rdf12/rdf-trig/syntax/trig-star-syntax-bad-02.trig
diff --git a/rdf/rdf12/rdf-trig/syntax/trig-star-syntax-bad-03.trig b/rdf/rdf12/rdf-trig/syntax/trig-star-syntax-bad-03.trig
diff --git a/rdf/rdf12/rdf-trig/syntax/trig-star-syntax-bad-04.trig b/rdf/rdf12/rdf-trig/syntax/trig-star-syntax-bad-04.trig
diff --git a/rdf/rdf12/rdf-trig/syntax/trig-star-syntax-bad-05.trig b/rdf/rdf12/rdf-trig/syntax/trig-star-syntax-bad-05.trig
diff --git a/rdf/rdf12/rdf-trig/syntax/trig-star-syntax-bad-06.trig b/rdf/rdf12/rdf-trig/syntax/trig-star-syntax-bad-06.trig
diff --git a/rdf/rdf12/rdf-trig/syntax/trig-star-syntax-bad-07.trig b/rdf/rdf12/rdf-trig/syntax/trig-star-syntax-bad-07.trig
diff --git a/rdf/rdf12/rdf-trig/syntax/trig-star-syntax-basic-03.trig b/rdf/rdf12/rdf-trig/syntax/trig-star-syntax-basic-03.trig
diff --git a/rdf/rdf12/rdf-trig/syntax/trig-star-syntax-basic-04.trig b/rdf/rdf12/rdf-trig/syntax/trig-star-syntax-basic-04.trig
diff --git a/rdf/rdf12/rdf-trig/syntax/trig-star-syntax-inside-03.trig b/rdf/rdf12/rdf-trig/syntax/trig-star-syntax-inside-03.trig
diff --git a/rdf/rdf12/rdf-trig/syntax/trig-star-syntax-inside-04.trig b/rdf/rdf12/rdf-trig/syntax/trig-star-syntax-inside-04.trig
diff --git a/rdf/rdf12/rdf-turtle/syntax/manifest.ttl b/rdf/rdf12/rdf-turtle/syntax/manifest.ttl
diff --git a/rdf/rdf12/rdf-turtle/syntax/turtle-star-syntax-bad-07.ttl b/rdf/rdf12/rdf-turtle/syntax/turtle-star-syntax-bad-07.ttl

Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-<< <http://example/s> <http://example/p> <http://example/o> >> <http://example/q> <http://example/z> <http://example/G> .`
	`1`	`+_:anon <http://example/q> <http://example/z> <http://example/G> .`
	`2`	`+_:anon <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example/s> <http://example/p> <http://example/o> )>> <http://example/G> .`
Original file line number	Diff line number	Diff line change
`@@ -1 +1,2 @@`
`1`		`-<http://example/a> <http://example/q> << <http://example/s> <http://example/p> <http://example/o> >> <http://example/G> .`
	`1`	`+<http://example/a> <http://example/q> _:anon <http://example/G> .`
	`2`	`+_:anon <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example/s> <http://example/p> <http://example/o> )>> <http://example/G> .`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+<http://example/i> <http://example/q> <http://example/z> <http://example/G> .`
	`2`	`+<http://example/i> <http://www.w3.org/1999/02/22-rdf-syntax-ns#reifies> <<( <http://example/s> <http://example/p> <http://example/o> )>> <http://example/G> .`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+PREFIX : <http://example/>`
	`2`	`+`
	`3`	`+:G {<< :s :p :o ~ :i >> :q :z .}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+PREFIX : <http://example/>`
	`2`	`+`
	`3`	`+:G {:a :q << :s :p :o ~ :i >> .}`