Disallow triple terms in subject position

rubensworks · rubensworks · commit 8ee020681bfb · 2024-10-25T08:58:11.000+02:00
diff --git a/sparql/sparql12/syntax-triple-terms-negative/basic-tripleterm-subject.rq b/sparql/sparql12/syntax-triple-terms-negative/basic-tripleterm-subject.rq
@@ -0,0 +1,10 @@
+PREFIX : <http://example.com/ns#>
+
+SELECT * {
+    VALUES ?x {
+        <<(:s :p :o )>>
+        <<( <<(:s :p :o )>> :q :z )>>
+    }
+    VALUES (?y ?z) { (<<(:s :p :o )>> 123 )
+                      (123 <<(:s :p :o )>> ) }
+}
diff --git a/sparql/sparql12/syntax-triple-terms-negative/compound-tripleterm-subject.rq b/sparql/sparql12/syntax-triple-terms-negative/compound-tripleterm-subject.rq
@@ -0,0 +1,10 @@
+PREFIX : <http://example.com/ns#>
+
+SELECT * {
+
+  <<(:x ?R :z )>> :p <<(:a :b ?C )>> .
+
+  <<( <<(:x ?R :z )>> :p <<(:a :b [] )>> )>>
+     :q
+  <<( <<([] ?R :z )>> :p <<(:a :b [] )>> )>> .
+}
diff --git a/sparql/sparql12/syntax-triple-terms-negative/manifest.ttl b/sparql/sparql12/syntax-triple-terms-negative/manifest.ttl
@@ -27,6 +27,7 @@
 :annotated-reifier-path
 :annotated-reifier-reifier-alternate-path
 :annotated-reifier-variable-path
+:basic-tripleterm-subject
 :bind-anonreified
 :bind-reified
 :bindbnode-anonreifier
@@ -35,6 +36,7 @@
 :bnode-predicate-anonreifier
 :bnode-predicate-reifier
 :bnode-predicate-tripleterm
+:compound-tripleterm-subject
 :list-anonreifier-01
 :list-anonreifier-02
 :list-reifier-01
@@ -43,6 +45,7 @@
 :list-tripleterm-02
 :nested-annotated-path-anonreifier
 :nested-annotated-path-reifier
+:nested-tripleterm-subject
 :quoted-list-object-anonreifier
 :quoted-list-object-reifier
 :quoted-list-object-tripleterm
@@ -158,6 +161,11 @@
    mf:name    "annotated-reifier-variable-path.rq" ;
    mf:action  <annotated-reifier-variable-path.rq> .
 
+:basic-tripleterm-subject rdf:type   mf:NegativeSyntaxTest11 ;
+   dawgt:approval dawgt:Proposed ;
+   mf:name    "basic-tripleterm-subject.rq" ;
+   mf:action  <basic-tripleterm-subject.rq> .
+
 :bind-anonreified rdf:type   mf:NegativeSyntaxTest11 ;
    dawgt:approval dawgt:Proposed ;
    mf:name    "bind-anonreified.rq" ;
@@ -198,6 +206,11 @@
    mf:name    "bnode-predicate-tripleterm.rq" ;
    mf:action  <bnode-predicate-tripleterm.rq> .
 
+:compound-tripleterm-subject rdf:type   mf:NegativeSyntaxTest11 ;
+   dawgt:approval dawgt:Proposed ;
+   mf:name    "compound-tripleterm-subject.rq" ;
+   mf:action  <compound-tripleterm-subject.rq> .
+
 :list-anonreifier-01 rdf:type   mf:NegativeSyntaxTest11 ;
    dawgt:approval dawgt:Proposed ;
    mf:name    "list-anonreifier-01.rq" ;
@@ -238,6 +251,11 @@
    mf:name    "nested-annotated-path-reifier.rq" ;
    mf:action  <nested-annotated-path-reifier.rq> .
 
+:nested-tripleterm-subject rdf:type   mf:NegativeSyntaxTest11 ;
+   dawgt:approval dawgt:Proposed ;
+   mf:name    "nested-tripleterm-subject.rq" ;
+   mf:action  <nested-tripleterm-subject.rq> .
+
 :quoted-list-object-anonreifier rdf:type   mf:NegativeSyntaxTest11 ;
    dawgt:approval dawgt:Proposed ;
    mf:name    "quoted-list-object-anonreifier.rq" ;
diff --git a/sparql/sparql12/syntax-triple-terms-negative/nested-tripleterm-subject.rq b/sparql/sparql12/syntax-triple-terms-negative/nested-tripleterm-subject.rq
@@ -0,0 +1,6 @@
+PREFIX : <http://example.com/ns#>
+
+SELECT * {
+  <<(?S :p :o )>> :r :z .
+  <<( <<(?S :p :o )>> :r :z )>> :q 1 .
+}
diff --git a/sparql/sparql12/syntax-triple-terms-positive/basic-tripleterm-05.rq b/sparql/sparql12/syntax-triple-terms-positive/basic-tripleterm-05.rq
@@ -3,7 +3,7 @@ PREFIX : <http://example.com/ns#>
 SELECT * {
     VALUES ?x {
         <<(:s :p :o )>>
-        <<( <<(:s :p :o )>> :q :z )>>
+        <<( :x :q <<(:s :p :o )>> )>>
     }
     VALUES (?y ?z) { (<<(:s :p :o )>> 123 )
                       (123 <<(:s :p :o )>> ) }
diff --git a/sparql/sparql12/syntax-triple-terms-positive/basic-tripleterm-06.rq b/sparql/sparql12/syntax-triple-terms-positive/basic-tripleterm-06.rq
@@ -1,4 +1,4 @@
 PREFIX : <http://example.com/ns#>
 
-CONSTRUCT { <<(:s :p :o )>> :q :z }
+CONSTRUCT { :s :q <<(:s :p :o )>> }
 WHERE {}
diff --git a/sparql/sparql12/syntax-triple-terms-positive/basic-tripleterm-07.rq b/sparql/sparql12/syntax-triple-terms-positive/basic-tripleterm-07.rq
@@ -1,6 +1,6 @@
 PREFIX : <http://example.com/ns#>
 
 CONSTRUCT WHERE {
-   <<(?s ?p ?o )>> ?q ?z .
+   :s ?q <<(?s ?p :o )>> .
    ?a ?b <<(?s ?p ?o )>> .
 }
diff --git a/sparql/sparql12/syntax-triple-terms-positive/compound-tripleterm.rq b/sparql/sparql12/syntax-triple-terms-positive/compound-tripleterm.rq
@@ -2,9 +2,8 @@ PREFIX : <http://example.com/ns#>
 
 SELECT * {
 
-  <<(:x ?R :z )>> :p <<(:a :b ?C )>> .
-
-  <<( <<(:x ?R :z )>> :p <<(:a :b [] )>> )>>
+  ?s :p <<(:a :b ?C )>> .
+  ?s
      :q
-  <<( <<([] ?R :z )>> :p <<(:a :b [] )>> )>> .
+  <<( ?s1 :p <<(:a :b [] )>> )>> .
 }
diff --git a/sparql/sparql12/syntax-triple-terms-positive/manifest.ttl b/sparql/sparql12/syntax-triple-terms-positive/manifest.ttl
@@ -102,7 +102,6 @@
 :nested-reifier-01
 :nested-reifier-02
 :nested-tripleterm-01
-:nested-tripleterm-02
 :update-anonreifier-01
 :update-anonreifier-02
 :update-anonreifier-03
@@ -584,11 +583,6 @@
    mf:name    "nested-tripleterm-01.rq" ;
    mf:action  <nested-tripleterm-01.rq> .
 
-:nested-tripleterm-02 rdf:type   mf:PositiveSyntaxTest11 ;
-   dawgt:approval dawgt:Proposed ;
-   mf:name    "nested-tripleterm-02.rq" ;
-   mf:action  <nested-tripleterm-02.rq> .
-
 :update-anonreifier-01 rdf:type   mf:PositiveUpdateSyntaxTest11 ;
    dawgt:approval dawgt:Proposed ;
    mf:name    "update-anonreifier-01.rq" ;
diff --git a/sparql/sparql12/syntax-triple-terms-positive/nested-tripleterm-01.rq b/sparql/sparql12/syntax-triple-terms-positive/nested-tripleterm-01.rq
@@ -1,6 +1,6 @@
 PREFIX : <http://example.com/ns#>
 
 SELECT * {
-  <<(?S :p :o )>> :r :z .
-  <<( <<(?S :p :o )>> :r :z )>> :q 1 .
+  :s :r <<(?S :p :o )>> .
+  :s :q <<( :s1 :r <<(?S :p :o )>> )>> .
 }
diff --git a/sparql/sparql12/syntax-triple-terms-positive/nested-tripleterm-02.rq b/sparql/sparql12/syntax-triple-terms-positive/nested-tripleterm-02.rq
diff --git a/sparql/sparql12/syntax-triple-terms-positive/update-tripleterm-01.rq b/sparql/sparql12/syntax-triple-terms-positive/update-tripleterm-01.rq
@@ -1,5 +1,5 @@
 PREFIX : <http://example.com/ns#>
 
 INSERT DATA {
-    <<( :a :b :c )>> :p :o .
+    :s :p <<( :a :b :c )>> .
 }
diff --git a/sparql/sparql12/syntax-triple-terms-positive/update-tripleterm-03.rq b/sparql/sparql12/syntax-triple-terms-positive/update-tripleterm-03.rq
@@ -1,8 +1,8 @@
 PREFIX : <http://example.com/ns#>
 
 INSERT {
-    <<( :a :b :c )>> ?P :o2  {| ?Y ?Z |}
+    ?S ?P <<( :a :b :c )>>  {| ?Y ?Z |}
 } WHERE {
-   <<( :a :b :c )>> ?P :o1 {| ?Y ?Z |}
+   :s ?P <<( :a :b :c )>> {| ?Y ?Z |}
 }
 
diff --git a/sparql/sparql12/syntax-triple-terms-positive/update-tripleterm-04.rq b/sparql/sparql12/syntax-triple-terms-positive/update-tripleterm-04.rq
@@ -1,8 +1,8 @@
 PREFIX : <http://example.com/ns#>
 
 INSERT {
-    <<( :a :b :c )>> ?P :o2  {| ?Y <<(:s1 :p1 ?Z)>> |}
+    :s ?P <<( :a :b :c )>>  {| ?Y <<(:s1 :p1 ?Z)>> |}
 } WHERE {
-   <<( :a :b :c )>> ?P :o1 {| ?Y <<(:s1 :p1 ?Z)>> |}
+   ?s ?P <<( :a :b :c )>> {| ?Y <<(:s1 :p1 ?Z)>> |}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ PREFIX : <http://example.com/ns#>`
`3`	`3`	`SELECT * {`
`4`	`4`	`VALUES ?x {`
`5`	`5`	`<<(:s :p :o )>>`
`6`		`- <<( <<(:s :p :o )>> :q :z )>>`
	`6`	`+ <<( :x :q <<(:s :p :o )>> )>>`
`7`	`7`	`}`
`8`	`8`	`VALUES (?y ?z) { (<<(:s :p :o )>> 123 )`
`9`	`9`	`(123 <<(:s :p :o )>> ) }`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`PREFIX : <http://example.com/ns#>`
`2`	`2`
`3`	`3`	`CONSTRUCT WHERE {`
`4`		`- <<(?s ?p ?o )>> ?q ?z .`
	`4`	`+ :s ?q <<(?s ?p :o )>> .`
`5`	`5`	`?a ?b <<(?s ?p ?o )>> .`
`6`	`6`	`}`