sparql 3.1.5 → 3.1.6

data/lib/sparql/grammar/parser11.rb

@@ -23,6 +23,7 @@ module SPARQL::Grammar
       STRAFTER STRBEFORE STRDT STRENDS STRLANG STRLEN STRSTARTS STRUUID STR
       TIMEZONE TZ UCASE URI UUID YEAR
       isBLANK isIRI isURI isLITERAL isNUMERIC sameTerm
+      isTRIPLE TRIPLE SUBJECT PREDICATE OBJECT
     }.map {|s| s.downcase.to_sym}.freeze
 
     BUILTIN_RULES = [:aggregate, :regex, :substr, :replace, :exists, :notexists].freeze
@@ -184,6 +185,7 @@ module SPARQL::Grammar
          |STRAFTER|STRBEFORE|STRDT|STRENDS|STRLANG|STRLEN|STRSTARTS|STRUUID|SUBSTR|STR|SUM
          |TIMEZONE|TZ|UCASE|UNDEF|URI|UUID|YEAR
          |isBLANK|isIRI|isURI|isLITERAL|isNUMERIC|sameTerm
+         |isTRIPLE|TRIPLE|SUBJECT|PREDICATE|OBJECT
         }x
         add_prod_datum(token.value.downcase.to_sym, token.value.downcase.to_sym)
       else
@@ -647,7 +649,7 @@ module SPARQL::Grammar
       data[:input_query] = input.delete(:query) || [SPARQL::Algebra::Operator::BGP.new]
     end
     production(:GraphPatternNotTriples) do |input, data, callback|
-      lhs = data[:input_query].first
+      lhs = Array(data[:input_query]).first
 
       # Filter trickls up to GroupGraphPatternSub
       add_prod_datum(:filter, data[:filter])
@@ -701,9 +703,9 @@ module SPARQL::Grammar
       end
     end
 
-    # [60]  Bind                    ::= 'BIND' '(' (Expression || EmbTP) 'AS' Var ')'
+    # [60]  Bind                    ::= 'BIND' '(' Expression 'AS' Var ')'
     production(:Bind) do |input, data, callback|
-      add_prod_datum :extend, [(data[:Expression] || data[:pattern]).unshift(data[:Var].first)]
+      add_prod_datum :extend, [data[:Expression].unshift(data[:Var].first)]
     end
 
     # [61]  InlineData	            ::= 'VALUES' DataBlock
@@ -752,7 +754,7 @@ module SPARQL::Grammar
       end
     end
 
-    # [65]  DataBlockValue	        ::= iri | RDFLiteral | NumericLiteral | BooleanLiteral | 'UNDEF'
+    # [65]  DataBlockValue	        ::= EmbTD | iri | RDFLiteral | NumericLiteral | BooleanLiteral | 'UNDEF'
     production(:DataBlockValue) do |input, data, callback|
       add_prod_datum :DataBlockValue, data.values.first
     end
@@ -831,7 +833,7 @@ module SPARQL::Grammar
       add_prod_datum(:ConstructTemplate, data[:ConstructTemplate])
     end
 
-    # [75]  	TriplesSameSubject	  ::=  	VarOrTerm PropertyListNotEmpty
+    # [75]  	TriplesSameSubject	  ::=  	VarOrTermOrEmbTP PropertyListNotEmpty
     #                                 |	TriplesNode PropertyList
     production(:TriplesSameSubject) do |input, data, callback|
       add_prod_datum(:pattern, data[:pattern])
@@ -840,8 +842,8 @@ module SPARQL::Grammar
     # [77]  	PropertyListNotEmpty	  ::=  	Verb ObjectList
     #                                       ( ';' ( Verb ObjectList )? )*
     start_production(:PropertyListNotEmpty) do |input, data, callback|
-      subject = input[:VarOrTerm] || input[:TriplesNode] || input[:GraphNode]
-      error(nil, "Expected VarOrTerm or TriplesNode or GraphNode", production: :PropertyListNotEmpty) if validate? && !subject
+      subject = input[:VarOrTermOrEmbTP] || input[:TriplesNode] || input[:GraphNode]
+      error(nil, "Expected VarOrTermOrEmbTP or TriplesNode or GraphNode", production: :PropertyListNotEmpty) if validate? && !subject
       data[:Subject] = subject
     end
     production(:PropertyListNotEmpty) do |input, data, callback|
@@ -867,17 +869,13 @@ module SPARQL::Grammar
       add_prod_datum(:path, data[:path])
     end
 
-    # [177]	AnnotationPattern	      ::=	'{|' PropertyListNotEmpty '|}'
-    start_production(:AnnotationPattern) do |input, data, callback|
-      data[:TriplesNode] = prod_data[:pattern].first
-    end
-    production(:AnnotationPattern) do |input, data, callback|
-      add_prod_datum(:pattern, data[:pattern])
+    # [80]  	Object	  ::=  	GraphNode AnnotationPattern?
+    start_production(:Object) do |input, data, callback|
+      data[:Subject] = Array(input[:Subject]).first
+      data[:Verb] = Array(input[:Verb]).first
     end
-
-    # [80]  	Object	  ::=  	GraphNode | EmbTP
     production(:Object) do |input, data, callback|
-      object = data[:GraphNode] || data[:EmbTP]
+      object = data[:GraphNode]
       add_prod_datum(:pattern, data[:pattern])
       if object
         if prod_data[:Verb]
@@ -891,8 +889,17 @@ module SPARQL::Grammar
         end
       end
     end
+    start_production(:_Object_1) do |input, data, callback|
+      pattern = RDF::Query::Pattern.new(input[:Subject], input[:Verb], input[:GraphNode].first)
+      error("ObjectPath", "Expected Verb",
+        production: :_Object_1) unless input[:Verb]
+      data[:TriplesNode] = [pattern]
+    end
+    production(:_Object_1) do |input, data, callback|
+      add_prod_datum(:pattern, data[:pattern])
+    end
 
-    # [81]	TriplesSameSubjectPath	::=	VarOrTerm PropertyListPathNotEmpty | TriplesNode PropertyListPath
+    # [81]	TriplesSameSubjectPath	::=	VarOrTermOrEmbTP PropertyListPathNotEmpty | TriplesNode PropertyListPath
     production(:TriplesSameSubjectPath) do |input, data, callback|
       add_prod_datum(:pattern, data[:pattern])
       add_prod_datum(:path, data[:path])
@@ -900,8 +907,8 @@ module SPARQL::Grammar
 
     # [83]  	PropertyListPathNotEmpty	  ::=  	( VerbPath | VerbSimple ) ObjectList ( ';' ( ( VerbPath | VerbSimple ) ObjectList )? )*
     start_production(:PropertyListPathNotEmpty) do |input, data, callback|
-      subject = input[:VarOrTerm] || input[:TriplesNode] || input[:GraphNode]
-      error(nil, "Expected VarOrTerm, got nothing", production: :PropertyListPathNotEmpty) if validate? && !subject
+      subject = input[:VarOrTermOrEmbTP] || input[:TriplesNode] || input[:GraphNode]
+      error(nil, "Expected VarOrTermOrEmbTP, got nothing", production: :PropertyListPathNotEmpty) if validate? && !subject
       data[:Subject] = subject
     end
     production(:PropertyListPathNotEmpty) do |input, data, callback|
@@ -941,9 +948,13 @@ module SPARQL::Grammar
       add_prod_datum(:path, data[:path])
     end
 
-    # [87]  	ObjectPath	  ::=  	GraphNodePath
+    # [87]  	ObjectPath	  ::=  	GraphNodePath AnnotationPatternPath?
+    start_production(:ObjectPath) do |input, data, callback|
+      data[:Subject] = Array(input[:Subject]).first
+      data[:Verb] = Array(input[:Verb]).first
+    end
     production(:ObjectPath) do |input, data, callback|
-      object = data[:VarOrTerm] || data[:TriplesNode] || data[:GraphNode]
+      object = data[:VarOrTermOrEmbTP] || data[:TriplesNode] || data[:GraphNode]
       if object
         if prod_data[:Verb]
           if data[:pattern] && data[:path]
@@ -951,6 +962,9 @@ module SPARQL::Grammar
             data[:pattern].unshift(RDF::Query::Pattern.new(prod_data[:Subject].first, prod_data[:Verb], object.first))
             bgp = SPARQL::Algebra::Expression[:bgp, data[:pattern]]
             add_prod_datum(:path, SPARQL::Algebra::Expression[:sequence, bgp, *data[:path]])
+          elsif data[:path]
+            # AnnotationPatternPath case
+            add_prod_datum(:path, data[:path])
           else
             add_pattern(:Object, subject: prod_data[:Subject], predicate: prod_data[:Verb], object: object)
             add_prod_datum(:pattern, data[:pattern])
@@ -964,6 +978,16 @@ module SPARQL::Grammar
         end
       end
     end
+    start_production(:_ObjectPath_1) do |input, data, callback|
+      pattern = RDF::Query::Pattern.new(input[:Subject], input[:Verb], input[:GraphNode].first)
+      error("ObjectPath", "Expected Verb",
+        production: :_ObjectPath_1) unless input[:Verb]
+      data[:TriplesNode] = [pattern]
+    end
+    production(:_ObjectPath_1) do |input, data, callback|
+      add_prod_datum(:pattern, data[:pattern])
+    end
+
     # [88]  	Path	  ::=  	PathAlternative
     # output is a :Path or :iri
     production(:Path) do |input, data, callback|
@@ -1092,29 +1116,24 @@ module SPARQL::Grammar
       add_prod_datum(:path, data[:path])
     end
 
-    # [104]  	GraphNode	  ::=  	VarOrTerm |	TriplesNode
+    # [104]  	GraphNode	  ::=  	VarOrTermOrEmbTP |	TriplesNode
     production(:GraphNode) do |input, data, callback|
-      term = data[:VarOrTerm] || data[:TriplesNode]
+      term = data[:VarOrTermOrEmbTP] || data[:TriplesNode]
       add_prod_datum(:pattern, data[:pattern])
       add_prod_datum(:GraphNode, term)
     end
 
-    # [105]	GraphNodePath	::=	VarOrTerm | TriplesNodePath
+    # [105]	GraphNodePath	::=	VarOrTermOrEmbTP | TriplesNodePath
     production(:GraphNodePath) do |input, data, callback|
-      term = data[:VarOrTerm] || data[:TriplesNode]
+      term = data[:VarOrTermOrEmbTP] || data[:TriplesNode]
       add_prod_datum(:pattern, data[:pattern])
       add_prod_datum(:path, data[:path])
       add_prod_datum(:GraphNode, term)
     end
 
-    # [106]  	VarOrTerm	  ::=  	Var | GraphTerm
-    production(:VarOrTerm) do |input, data, callback|
-      data.values.each {|v| add_prod_datum(:VarOrTerm, v)}
-    end
-
     # [106s]  	VarOrTermOrEmbTP        ::= Var | GraphTerm | EmbTP
     production(:VarOrTermOrEmbTP) do |input, data, callback|
-      data.values.each {|v| add_prod_datum(:VarOrTerm, v)}
+      data.values.each {|v| add_prod_datum(:VarOrTermOrEmbTP, v)}
     end
 
     # [107]  	VarOrIri	  ::=  	Var | iri
@@ -1287,6 +1306,7 @@ module SPARQL::Grammar
     #                                 | iriOrFunction | RDFLiteral
     #                                 | NumericLiteral | BooleanLiteral
     #                                 | Var
+    #                                 | EmbTP
     production(:PrimaryExpression) do |input, data, callback|
       if data[:Expression]
         add_prod_datum(:Expression, data[:Expression])
@@ -1300,6 +1320,8 @@ module SPARQL::Grammar
         add_prod_datum(:Expression, data[:literal])
       elsif data[:Var]
         add_prod_datum(:Expression, data[:Var])
+      elsif data[:pattern]
+        add_prod_datum(:Expression, data[:pattern])
       end
 
       # Keep track of this for parent UnaryExpression production
@@ -1470,6 +1492,43 @@ module SPARQL::Grammar
       add_prod_datum(:UnaryExpression, data[:UnaryExpression])
     end
 
+    # [177]	AnnotationPattern	      ::=	'{|' PropertyListNotEmpty '|}'
+    #start_production(:AnnotationPattern) do |input, data, callback|
+    #  data[:TriplesNode] = prod_data[:TriplesNode].first
+    #end
+    #production(:AnnotationPattern) do |input, data, callback|
+    #  add_prod_datum(:pattern, data[:pattern])
+    #end
+
+    # [178]	AnnotationPatternPath	      ::=	'{|' PropertyListPathNotEmpty '|}'
+    start_production(:AnnotationPatternPath) do |input, data, callback|
+      data[:TriplesNode] = input[:TriplesNode]
+    end
+    production(:AnnotationPatternPath) do |input, data, callback|
+      if data[:pattern]
+        add_prod_datum(:pattern, data[:pattern])
+      elsif data[:path]
+        # Replace the subject in the path with the node being annotated.
+        data[:path].first.operands[0] = data[:TriplesNode]
+        add_prod_datum(:path, data[:path])
+      end
+    end
+
+    # [179] EmbTD                   ::= '<<' DataValueTerm ( iri | 'a' ) DataValueTerm '>>'
+    production(:EmbTD) do |input, data, callback|
+      subject, object = data[:DataValueTerm]
+      predicate = data[:iri]
+      add_pattern(:EmbTD,
+                  subject: subject,
+                  predicate: predicate,
+                  object: object)
+    end
+
+    # [180] DataValueTerm           ::= EmbTD | iri | RDFLiteral | NumericLiteral | BooleanLiteral
+    production(:DataValueTerm) do |input, data, callback|
+      add_prod_datum :DataValueTerm, data.values.first
+    end
+    
     ##
     # Initializes a new parser instance.
     #

data/lib/sparql/grammar/terminals11.rb

@@ -108,6 +108,7 @@ module SPARQL::Grammar
                  |TIMEZONE|TO|TZ|UCASE|UNDEF|UNION|URI|USING|UUID|VALUES
                  |WHERE|WITH|YEAR
                  |isBLANK|isIRI|isURI|isLITERAL|isNUMERIC|sameTerm
+                 |isTRIPLE|TRIPLE|SUBJECT|PREDICATE|OBJECT
                  |true
                  |false
                  |<<|>>
@@ -133,6 +134,7 @@ module SPARQL::Grammar
       TIMEZONE TO TZ UCASE UNDEF UNION URI USING UUID
       VALUES WHERE WITH YEAR
       isBLANK isIRI isURI isLITERAL isNUMERIC sameTerm
+      isTRIPLE TRIPLE SUBJECT PREDICATE OBJECT
       true false
     } + [
       "DELETE DATA",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sparql
 version: !ruby/object:Gem::Version
-  version: 3.1.5
+  version: 3.1.6
 platform: ruby
 authors:
 - Gregg Kellogg
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-18 00:00:00.000000000 Z
+date: 2021-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdf
@@ -20,7 +20,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.12
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
         version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.8
+        version: 3.1.12
 - !ruby/object:Gem::Dependency
   name: rdf-aggregate-repo
   requirement: !ruby/object:Gem::Requirement
@@ -312,6 +312,7 @@ files:
 - lib/sparql/algebra/operator/is_iri.rb
 - lib/sparql/algebra/operator/is_literal.rb
 - lib/sparql/algebra/operator/is_numeric.rb
+- lib/sparql/algebra/operator/is_triple.rb
 - lib/sparql/algebra/operator/join.rb
 - lib/sparql/algebra/operator/lang.rb
 - lib/sparql/algebra/operator/lang_matches.rb
@@ -336,6 +337,7 @@ files:
 - lib/sparql/algebra/operator/notin.rb
 - lib/sparql/algebra/operator/notoneof.rb
 - lib/sparql/algebra/operator/now.rb
+- lib/sparql/algebra/operator/object.rb
 - lib/sparql/algebra/operator/or.rb
 - lib/sparql/algebra/operator/order.rb
 - lib/sparql/algebra/operator/path.rb
@@ -343,6 +345,7 @@ files:
 - lib/sparql/algebra/operator/path_plus.rb
 - lib/sparql/algebra/operator/path_star.rb
 - lib/sparql/algebra/operator/plus.rb
+- lib/sparql/algebra/operator/predicate.rb
 - lib/sparql/algebra/operator/prefix.rb
 - lib/sparql/algebra/operator/project.rb
 - lib/sparql/algebra/operator/rand.rb
@@ -370,11 +373,13 @@ files:
 - lib/sparql/algebra/operator/strlen.rb
 - lib/sparql/algebra/operator/strstarts.rb
 - lib/sparql/algebra/operator/struuid.rb
+- lib/sparql/algebra/operator/subject.rb
 - lib/sparql/algebra/operator/substr.rb
 - lib/sparql/algebra/operator/subtract.rb
 - lib/sparql/algebra/operator/sum.rb
 - lib/sparql/algebra/operator/table.rb
 - lib/sparql/algebra/operator/timezone.rb
+- lib/sparql/algebra/operator/triple.rb
 - lib/sparql/algebra/operator/tz.rb
 - lib/sparql/algebra/operator/ucase.rb
 - lib/sparql/algebra/operator/union.rb
@@ -413,7 +418,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: SPARQL Query and Update library for Ruby.