sparql 3.1.7 → 3.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcc81f10a741a9060299f9b3f54e1a7a35442fb7b68b7a79b2d1b67e16c0108a
-  data.tar.gz: aa6dd52a91d86b9a981edb5f4d56bdd0da288932ece265578ba773bb289a5fe0
+  metadata.gz: 0fc6d6745c325bd23d83fe640eb238a22406b567cf06223703afd90ea5733be1
+  data.tar.gz: 056cde1c14633aa791f492be673eb023bab95d7af4e5b19fb94c99540fc22908
 SHA512:
-  metadata.gz: 64669164cff7cdd9b1580bba3576247dafff7feef77ab63ba355afb51bded23a8f996ca952332abea8a4d06f8aca4ae5db25702a69748f8577aeedb720c5f788
-  data.tar.gz: d269e6c8edf25e5929876d292290257527f4bfe69def6fbe3e4500283a0ed2418ac4df5420a24fd35f826970ae63c3d679ba998d27184851cc8fe58648521df7
+  metadata.gz: 32187664d7d06bd49cffa8354987ce3f11ba44b35960a92ac80353a538a15489b342f1d3e66a0ad792971489e83cc57ab05b936e93f8e04fe2f5df4a527d3d39
+  data.tar.gz: 9d8a75fd40c9ccbac6a9753d9b7a04b9e26a4504a55636d61d3d34c1d4dde77c6838d5ac45828a40d06b7c4658971c1f435da0c6812e7b2eda4aa5dfcfaa9cda

data/VERSION

@@ -1 +1 @@
-3.1.7
+3.1.8

data/bin/sparql

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 $:.unshift("../../lib", __FILE__)
+require 'logger'
 require 'sparql'
 begin
   require 'linkeddata'

data/lib/sparql/grammar/meta.rb

@@ -1,4 +1,4 @@
-# This file is automatically generated by ebnf version 2.1.2
+# This file is automatically generated by ebnf version 2.1.3
 # Derived from etc/sparql11.bnf
 module SPARQL::Grammar::Meta
   START = :QueryUnit
@@ -2055,7 +2055,7 @@ module SPARQL::Grammar::Meta
       :VAR2 => [:InlineDataOneVar],
     },
     :DataBlockValue => {
-      "<<" => [:EmbTD],
+      "<<" => [:QuotedTriple],
       :DECIMAL => [:NumericLiteral],
       :DECIMAL_NEGATIVE => [:NumericLiteral],
       :DECIMAL_POSITIVE => [:NumericLiteral],
@@ -2077,7 +2077,7 @@ module SPARQL::Grammar::Meta
       "true" => [:BooleanLiteral],
     },
     :DataValueTerm => {
-      "<<" => [:EmbTD],
+      "<<" => [:QuotedTriple],
       :DECIMAL => [:NumericLiteral],
       :DECIMAL_NEGATIVE => [:NumericLiteral],
       :DECIMAL_POSITIVE => [:NumericLiteral],
@@ -2195,51 +2195,14 @@ module SPARQL::Grammar::Meta
       "NAMED" => [],
       "SILENT" => ["SILENT"],
     },
-    :EmbSubjectOrObject => {
-      "<<" => [:EmbTP],
-      :ANON => [:BlankNode],
-      :BLANK_NODE_LABEL => [:BlankNode],
-      :DECIMAL => [:NumericLiteral],
-      :DECIMAL_NEGATIVE => [:NumericLiteral],
-      :DECIMAL_POSITIVE => [:NumericLiteral],
-      :DOUBLE => [:NumericLiteral],
-      :DOUBLE_NEGATIVE => [:NumericLiteral],
-      :DOUBLE_POSITIVE => [:NumericLiteral],
-      :INTEGER => [:NumericLiteral],
-      :INTEGER_NEGATIVE => [:NumericLiteral],
-      :INTEGER_POSITIVE => [:NumericLiteral],
-      :IRIREF => [:iri],
-      :PNAME_LN => [:iri],
-      :PNAME_NS => [:iri],
-      :STRING_LITERAL1 => [:RDFLiteral],
-      :STRING_LITERAL2 => [:RDFLiteral],
-      :STRING_LITERAL_LONG1 => [:RDFLiteral],
-      :STRING_LITERAL_LONG2 => [:RDFLiteral],
-      :VAR1 => [:Var],
-      :VAR2 => [:Var],
-      "false" => [:BooleanLiteral],
-      "true" => [:BooleanLiteral],
-    },
-    :EmbTD => {
-      "<<" => ["<<", :DataValueTerm, :_EmbTD_1, :DataValueTerm, ">>"],
-    },
-    :_EmbTD_1 => {
-      :IRIREF => [:iri],
-      :PNAME_LN => [:iri],
-      :PNAME_NS => [:iri],
-      "a" => ["a"],
-    },
-    :EmbTP => {
-      "<<" => ["<<", :EmbSubjectOrObject, :Verb, :EmbSubjectOrObject, ">>"],
-    },
     :ExistsFunc => {
       "EXISTS" => ["EXISTS", :GroupGraphPattern],
     },
-    :ExprEmbTP => {
+    :ExprQuotedTP => {
       "<<" => ["<<", :ExprVarOrTerm, :Verb, :ExprVarOrTerm, ">>"],
     },
     :ExprVarOrTerm => {
-      "<<" => [:ExprEmbTP],
+      "<<" => [:ExprQuotedTP],
       :DECIMAL => [:NumericLiteral],
       :DECIMAL_NEGATIVE => [:NumericLiteral],
       :DECIMAL_POSITIVE => [:NumericLiteral],
@@ -2385,59 +2348,59 @@ module SPARQL::Grammar::Meta
     },
     :GraphNode => {
       "(" => [:TriplesNode],
-      "<<" => [:VarOrTermOrEmbTP],
-      :ANON => [:VarOrTermOrEmbTP],
-      :BLANK_NODE_LABEL => [:VarOrTermOrEmbTP],
-      :DECIMAL => [:VarOrTermOrEmbTP],
-      :DECIMAL_NEGATIVE => [:VarOrTermOrEmbTP],
-      :DECIMAL_POSITIVE => [:VarOrTermOrEmbTP],
-      :DOUBLE => [:VarOrTermOrEmbTP],
-      :DOUBLE_NEGATIVE => [:VarOrTermOrEmbTP],
-      :DOUBLE_POSITIVE => [:VarOrTermOrEmbTP],
-      :INTEGER => [:VarOrTermOrEmbTP],
-      :INTEGER_NEGATIVE => [:VarOrTermOrEmbTP],
-      :INTEGER_POSITIVE => [:VarOrTermOrEmbTP],
-      :IRIREF => [:VarOrTermOrEmbTP],
-      :NIL => [:VarOrTermOrEmbTP],
-      :PNAME_LN => [:VarOrTermOrEmbTP],
-      :PNAME_NS => [:VarOrTermOrEmbTP],
-      :STRING_LITERAL1 => [:VarOrTermOrEmbTP],
-      :STRING_LITERAL2 => [:VarOrTermOrEmbTP],
-      :STRING_LITERAL_LONG1 => [:VarOrTermOrEmbTP],
-      :STRING_LITERAL_LONG2 => [:VarOrTermOrEmbTP],
-      :VAR1 => [:VarOrTermOrEmbTP],
-      :VAR2 => [:VarOrTermOrEmbTP],
+      "<<" => [:VarOrTermOrQuotedTP],
+      :ANON => [:VarOrTermOrQuotedTP],
+      :BLANK_NODE_LABEL => [:VarOrTermOrQuotedTP],
+      :DECIMAL => [:VarOrTermOrQuotedTP],
+      :DECIMAL_NEGATIVE => [:VarOrTermOrQuotedTP],
+      :DECIMAL_POSITIVE => [:VarOrTermOrQuotedTP],
+      :DOUBLE => [:VarOrTermOrQuotedTP],
+      :DOUBLE_NEGATIVE => [:VarOrTermOrQuotedTP],
+      :DOUBLE_POSITIVE => [:VarOrTermOrQuotedTP],
+      :INTEGER => [:VarOrTermOrQuotedTP],
+      :INTEGER_NEGATIVE => [:VarOrTermOrQuotedTP],
+      :INTEGER_POSITIVE => [:VarOrTermOrQuotedTP],
+      :IRIREF => [:VarOrTermOrQuotedTP],
+      :NIL => [:VarOrTermOrQuotedTP],
+      :PNAME_LN => [:VarOrTermOrQuotedTP],
+      :PNAME_NS => [:VarOrTermOrQuotedTP],
+      :STRING_LITERAL1 => [:VarOrTermOrQuotedTP],
+      :STRING_LITERAL2 => [:VarOrTermOrQuotedTP],
+      :STRING_LITERAL_LONG1 => [:VarOrTermOrQuotedTP],
+      :STRING_LITERAL_LONG2 => [:VarOrTermOrQuotedTP],
+      :VAR1 => [:VarOrTermOrQuotedTP],
+      :VAR2 => [:VarOrTermOrQuotedTP],
       "[" => [:TriplesNode],
-      "false" => [:VarOrTermOrEmbTP],
-      "true" => [:VarOrTermOrEmbTP],
+      "false" => [:VarOrTermOrQuotedTP],
+      "true" => [:VarOrTermOrQuotedTP],
     },
     :GraphNodePath => {
       "(" => [:TriplesNodePath],
-      "<<" => [:VarOrTermOrEmbTP],
-      :ANON => [:VarOrTermOrEmbTP],
-      :BLANK_NODE_LABEL => [:VarOrTermOrEmbTP],
-      :DECIMAL => [:VarOrTermOrEmbTP],
-      :DECIMAL_NEGATIVE => [:VarOrTermOrEmbTP],
-      :DECIMAL_POSITIVE => [:VarOrTermOrEmbTP],
-      :DOUBLE => [:VarOrTermOrEmbTP],
-      :DOUBLE_NEGATIVE => [:VarOrTermOrEmbTP],
-      :DOUBLE_POSITIVE => [:VarOrTermOrEmbTP],
-      :INTEGER => [:VarOrTermOrEmbTP],
-      :INTEGER_NEGATIVE => [:VarOrTermOrEmbTP],
-      :INTEGER_POSITIVE => [:VarOrTermOrEmbTP],
-      :IRIREF => [:VarOrTermOrEmbTP],
-      :NIL => [:VarOrTermOrEmbTP],
-      :PNAME_LN => [:VarOrTermOrEmbTP],
-      :PNAME_NS => [:VarOrTermOrEmbTP],
-      :STRING_LITERAL1 => [:VarOrTermOrEmbTP],
-      :STRING_LITERAL2 => [:VarOrTermOrEmbTP],
-      :STRING_LITERAL_LONG1 => [:VarOrTermOrEmbTP],
-      :STRING_LITERAL_LONG2 => [:VarOrTermOrEmbTP],
-      :VAR1 => [:VarOrTermOrEmbTP],
-      :VAR2 => [:VarOrTermOrEmbTP],
+      "<<" => [:VarOrTermOrQuotedTP],
+      :ANON => [:VarOrTermOrQuotedTP],
+      :BLANK_NODE_LABEL => [:VarOrTermOrQuotedTP],
+      :DECIMAL => [:VarOrTermOrQuotedTP],
+      :DECIMAL_NEGATIVE => [:VarOrTermOrQuotedTP],
+      :DECIMAL_POSITIVE => [:VarOrTermOrQuotedTP],
+      :DOUBLE => [:VarOrTermOrQuotedTP],
+      :DOUBLE_NEGATIVE => [:VarOrTermOrQuotedTP],
+      :DOUBLE_POSITIVE => [:VarOrTermOrQuotedTP],
+      :INTEGER => [:VarOrTermOrQuotedTP],
+      :INTEGER_NEGATIVE => [:VarOrTermOrQuotedTP],
+      :INTEGER_POSITIVE => [:VarOrTermOrQuotedTP],
+      :IRIREF => [:VarOrTermOrQuotedTP],
+      :NIL => [:VarOrTermOrQuotedTP],
+      :PNAME_LN => [:VarOrTermOrQuotedTP],
+      :PNAME_NS => [:VarOrTermOrQuotedTP],
+      :STRING_LITERAL1 => [:VarOrTermOrQuotedTP],
+      :STRING_LITERAL2 => [:VarOrTermOrQuotedTP],
+      :STRING_LITERAL_LONG1 => [:VarOrTermOrQuotedTP],
+      :STRING_LITERAL_LONG2 => [:VarOrTermOrQuotedTP],
+      :VAR1 => [:VarOrTermOrQuotedTP],
+      :VAR2 => [:VarOrTermOrQuotedTP],
       "[" => [:TriplesNodePath],
-      "false" => [:VarOrTermOrEmbTP],
-      "true" => [:VarOrTermOrEmbTP],
+      "false" => [:VarOrTermOrQuotedTP],
+      "true" => [:VarOrTermOrQuotedTP],
     },
     :GraphOrDefault => {
       "DEFAULT" => ["DEFAULT"],
@@ -4700,7 +4663,7 @@ module SPARQL::Grammar::Meta
     },
     :PrimaryExpression => {
       "(" => [:BrackettedExpression],
-      "<<" => [:ExprEmbTP],
+      "<<" => [:ExprQuotedTP],
       "ABS" => [:BuiltInCall],
       "AVG" => [:BuiltInCall],
       "BNODE" => [:BuiltInCall],
@@ -5174,6 +5137,18 @@ module SPARQL::Grammar::Meta
       "DESCRIBE" => [:DescribeQuery],
       "SELECT" => [:SelectQuery],
     },
+    :QuotedTP => {
+      "<<" => ["<<", :qtSubjectOrObject, :Verb, :qtSubjectOrObject, ">>"],
+    },
+    :QuotedTriple => {
+      "<<" => ["<<", :DataValueTerm, :_QuotedTriple_1, :DataValueTerm, ">>"],
+    },
+    :_QuotedTriple_1 => {
+      :IRIREF => [:iri],
+      :PNAME_LN => [:iri],
+      :PNAME_NS => [:iri],
+      "a" => ["a"],
+    },
     :RDFLiteral => {
       :STRING_LITERAL1 => [:String, :_RDFLiteral_1],
       :STRING_LITERAL2 => [:String, :_RDFLiteral_1],
@@ -5694,60 +5669,60 @@ module SPARQL::Grammar::Meta
       "true" => [:_TriplesSameSubjectPath_1],
     },
     :_TriplesSameSubjectPath_1 => {
-      "<<" => [:VarOrTermOrEmbTP, :PropertyListPathNotEmpty],
-      :ANON => [:VarOrTermOrEmbTP, :PropertyListPathNotEmpty],
-      :BLANK_NODE_LABEL => [:VarOrTermOrEmbTP, :PropertyListPathNotEmpty],
-      :DECIMAL => [:VarOrTermOrEmbTP, :PropertyListPathNotEmpty],
-      :DECIMAL_NEGATIVE => [:VarOrTermOrEmbTP, :PropertyListPathNotEmpty],
-      :DECIMAL_POSITIVE => [:VarOrTermOrEmbTP, :PropertyListPathNotEmpty],
-      :DOUBLE => [:VarOrTermOrEmbTP, :PropertyListPathNotEmpty],
-      :DOUBLE_NEGATIVE => [:VarOrTermOrEmbTP, :PropertyListPathNotEmpty],
-      :DOUBLE_POSITIVE => [:VarOrTermOrEmbTP, :PropertyListPathNotEmpty],
-      :INTEGER => [:VarOrTermOrEmbTP, :PropertyListPathNotEmpty],
-      :INTEGER_NEGATIVE => [:VarOrTermOrEmbTP, :PropertyListPathNotEmpty],
-      :INTEGER_POSITIVE => [:VarOrTermOrEmbTP, :PropertyListPathNotEmpty],
-      :IRIREF => [:VarOrTermOrEmbTP, :PropertyListPathNotEmpty],
-      :NIL => [:VarOrTermOrEmbTP, :PropertyListPathNotEmpty],
-      :PNAME_LN => [:VarOrTermOrEmbTP, :PropertyListPathNotEmpty],
-      :PNAME_NS => [:VarOrTermOrEmbTP, :PropertyListPathNotEmpty],
-      :STRING_LITERAL1 => [:VarOrTermOrEmbTP, :PropertyListPathNotEmpty],
-      :STRING_LITERAL2 => [:VarOrTermOrEmbTP, :PropertyListPathNotEmpty],
-      :STRING_LITERAL_LONG1 => [:VarOrTermOrEmbTP, :PropertyListPathNotEmpty],
-      :STRING_LITERAL_LONG2 => [:VarOrTermOrEmbTP, :PropertyListPathNotEmpty],
-      :VAR1 => [:VarOrTermOrEmbTP, :PropertyListPathNotEmpty],
-      :VAR2 => [:VarOrTermOrEmbTP, :PropertyListPathNotEmpty],
-      "false" => [:VarOrTermOrEmbTP, :PropertyListPathNotEmpty],
-      "true" => [:VarOrTermOrEmbTP, :PropertyListPathNotEmpty],
+      "<<" => [:VarOrTermOrQuotedTP, :PropertyListPathNotEmpty],
+      :ANON => [:VarOrTermOrQuotedTP, :PropertyListPathNotEmpty],
+      :BLANK_NODE_LABEL => [:VarOrTermOrQuotedTP, :PropertyListPathNotEmpty],
+      :DECIMAL => [:VarOrTermOrQuotedTP, :PropertyListPathNotEmpty],
+      :DECIMAL_NEGATIVE => [:VarOrTermOrQuotedTP, :PropertyListPathNotEmpty],
+      :DECIMAL_POSITIVE => [:VarOrTermOrQuotedTP, :PropertyListPathNotEmpty],
+      :DOUBLE => [:VarOrTermOrQuotedTP, :PropertyListPathNotEmpty],
+      :DOUBLE_NEGATIVE => [:VarOrTermOrQuotedTP, :PropertyListPathNotEmpty],
+      :DOUBLE_POSITIVE => [:VarOrTermOrQuotedTP, :PropertyListPathNotEmpty],
+      :INTEGER => [:VarOrTermOrQuotedTP, :PropertyListPathNotEmpty],
+      :INTEGER_NEGATIVE => [:VarOrTermOrQuotedTP, :PropertyListPathNotEmpty],
+      :INTEGER_POSITIVE => [:VarOrTermOrQuotedTP, :PropertyListPathNotEmpty],
+      :IRIREF => [:VarOrTermOrQuotedTP, :PropertyListPathNotEmpty],
+      :NIL => [:VarOrTermOrQuotedTP, :PropertyListPathNotEmpty],
+      :PNAME_LN => [:VarOrTermOrQuotedTP, :PropertyListPathNotEmpty],
+      :PNAME_NS => [:VarOrTermOrQuotedTP, :PropertyListPathNotEmpty],
+      :STRING_LITERAL1 => [:VarOrTermOrQuotedTP, :PropertyListPathNotEmpty],
+      :STRING_LITERAL2 => [:VarOrTermOrQuotedTP, :PropertyListPathNotEmpty],
+      :STRING_LITERAL_LONG1 => [:VarOrTermOrQuotedTP, :PropertyListPathNotEmpty],
+      :STRING_LITERAL_LONG2 => [:VarOrTermOrQuotedTP, :PropertyListPathNotEmpty],
+      :VAR1 => [:VarOrTermOrQuotedTP, :PropertyListPathNotEmpty],
+      :VAR2 => [:VarOrTermOrQuotedTP, :PropertyListPathNotEmpty],
+      "false" => [:VarOrTermOrQuotedTP, :PropertyListPathNotEmpty],
+      "true" => [:VarOrTermOrQuotedTP, :PropertyListPathNotEmpty],
     },
     :_TriplesSameSubjectPath_2 => {
       "(" => [:TriplesNodePath, :PropertyListPath],
       "[" => [:TriplesNodePath, :PropertyListPath],
     },
     :_TriplesSameSubject_1 => {
-      "<<" => [:VarOrTermOrEmbTP, :PropertyListNotEmpty],
-      :ANON => [:VarOrTermOrEmbTP, :PropertyListNotEmpty],
-      :BLANK_NODE_LABEL => [:VarOrTermOrEmbTP, :PropertyListNotEmpty],
-      :DECIMAL => [:VarOrTermOrEmbTP, :PropertyListNotEmpty],
-      :DECIMAL_NEGATIVE => [:VarOrTermOrEmbTP, :PropertyListNotEmpty],
-      :DECIMAL_POSITIVE => [:VarOrTermOrEmbTP, :PropertyListNotEmpty],
-      :DOUBLE => [:VarOrTermOrEmbTP, :PropertyListNotEmpty],
-      :DOUBLE_NEGATIVE => [:VarOrTermOrEmbTP, :PropertyListNotEmpty],
-      :DOUBLE_POSITIVE => [:VarOrTermOrEmbTP, :PropertyListNotEmpty],
-      :INTEGER => [:VarOrTermOrEmbTP, :PropertyListNotEmpty],
-      :INTEGER_NEGATIVE => [:VarOrTermOrEmbTP, :PropertyListNotEmpty],
-      :INTEGER_POSITIVE => [:VarOrTermOrEmbTP, :PropertyListNotEmpty],
-      :IRIREF => [:VarOrTermOrEmbTP, :PropertyListNotEmpty],
-      :NIL => [:VarOrTermOrEmbTP, :PropertyListNotEmpty],
-      :PNAME_LN => [:VarOrTermOrEmbTP, :PropertyListNotEmpty],
-      :PNAME_NS => [:VarOrTermOrEmbTP, :PropertyListNotEmpty],
-      :STRING_LITERAL1 => [:VarOrTermOrEmbTP, :PropertyListNotEmpty],
-      :STRING_LITERAL2 => [:VarOrTermOrEmbTP, :PropertyListNotEmpty],
-      :STRING_LITERAL_LONG1 => [:VarOrTermOrEmbTP, :PropertyListNotEmpty],
-      :STRING_LITERAL_LONG2 => [:VarOrTermOrEmbTP, :PropertyListNotEmpty],
-      :VAR1 => [:VarOrTermOrEmbTP, :PropertyListNotEmpty],
-      :VAR2 => [:VarOrTermOrEmbTP, :PropertyListNotEmpty],
-      "false" => [:VarOrTermOrEmbTP, :PropertyListNotEmpty],
-      "true" => [:VarOrTermOrEmbTP, :PropertyListNotEmpty],
+      "<<" => [:VarOrTermOrQuotedTP, :PropertyListNotEmpty],
+      :ANON => [:VarOrTermOrQuotedTP, :PropertyListNotEmpty],
+      :BLANK_NODE_LABEL => [:VarOrTermOrQuotedTP, :PropertyListNotEmpty],
+      :DECIMAL => [:VarOrTermOrQuotedTP, :PropertyListNotEmpty],
+      :DECIMAL_NEGATIVE => [:VarOrTermOrQuotedTP, :PropertyListNotEmpty],
+      :DECIMAL_POSITIVE => [:VarOrTermOrQuotedTP, :PropertyListNotEmpty],
+      :DOUBLE => [:VarOrTermOrQuotedTP, :PropertyListNotEmpty],
+      :DOUBLE_NEGATIVE => [:VarOrTermOrQuotedTP, :PropertyListNotEmpty],
+      :DOUBLE_POSITIVE => [:VarOrTermOrQuotedTP, :PropertyListNotEmpty],
+      :INTEGER => [:VarOrTermOrQuotedTP, :PropertyListNotEmpty],
+      :INTEGER_NEGATIVE => [:VarOrTermOrQuotedTP, :PropertyListNotEmpty],
+      :INTEGER_POSITIVE => [:VarOrTermOrQuotedTP, :PropertyListNotEmpty],
+      :IRIREF => [:VarOrTermOrQuotedTP, :PropertyListNotEmpty],
+      :NIL => [:VarOrTermOrQuotedTP, :PropertyListNotEmpty],
+      :PNAME_LN => [:VarOrTermOrQuotedTP, :PropertyListNotEmpty],
+      :PNAME_NS => [:VarOrTermOrQuotedTP, :PropertyListNotEmpty],
+      :STRING_LITERAL1 => [:VarOrTermOrQuotedTP, :PropertyListNotEmpty],
+      :STRING_LITERAL2 => [:VarOrTermOrQuotedTP, :PropertyListNotEmpty],
+      :STRING_LITERAL_LONG1 => [:VarOrTermOrQuotedTP, :PropertyListNotEmpty],
+      :STRING_LITERAL_LONG2 => [:VarOrTermOrQuotedTP, :PropertyListNotEmpty],
+      :VAR1 => [:VarOrTermOrQuotedTP, :PropertyListNotEmpty],
+      :VAR2 => [:VarOrTermOrQuotedTP, :PropertyListNotEmpty],
+      "false" => [:VarOrTermOrQuotedTP, :PropertyListNotEmpty],
+      "true" => [:VarOrTermOrQuotedTP, :PropertyListNotEmpty],
     },
     :_TriplesSameSubject_2 => {
       "(" => [:TriplesNode, :PropertyList],
@@ -6131,8 +6106,8 @@ module SPARQL::Grammar::Meta
       :VAR1 => [:Var],
       :VAR2 => [:Var],
     },
-    :VarOrTermOrEmbTP => {
-      "<<" => [:EmbTP],
+    :VarOrTermOrQuotedTP => {
+      "<<" => [:QuotedTP],
       :ANON => [:GraphTerm],
       :BLANK_NODE_LABEL => [:GraphTerm],
       :DECIMAL => [:GraphTerm],
@@ -6224,6 +6199,31 @@ module SPARQL::Grammar::Meta
       "NOT" => [],
       "||" => [],
     },
+    :qtSubjectOrObject => {
+      "<<" => [:QuotedTP],
+      :ANON => [:BlankNode],
+      :BLANK_NODE_LABEL => [:BlankNode],
+      :DECIMAL => [:NumericLiteral],
+      :DECIMAL_NEGATIVE => [:NumericLiteral],
+      :DECIMAL_POSITIVE => [:NumericLiteral],
+      :DOUBLE => [:NumericLiteral],
+      :DOUBLE_NEGATIVE => [:NumericLiteral],
+      :DOUBLE_POSITIVE => [:NumericLiteral],
+      :INTEGER => [:NumericLiteral],
+      :INTEGER_NEGATIVE => [:NumericLiteral],
+      :INTEGER_POSITIVE => [:NumericLiteral],
+      :IRIREF => [:iri],
+      :PNAME_LN => [:iri],
+      :PNAME_NS => [:iri],
+      :STRING_LITERAL1 => [:RDFLiteral],
+      :STRING_LITERAL2 => [:RDFLiteral],
+      :STRING_LITERAL_LONG1 => [:RDFLiteral],
+      :STRING_LITERAL_LONG2 => [:RDFLiteral],
+      :VAR1 => [:Var],
+      :VAR2 => [:Var],
+      "false" => [:BooleanLiteral],
+      "true" => [:BooleanLiteral],
+    },
   }.freeze
   TERMINALS = [
     "!",
@@ -10976,10 +10976,10 @@ module SPARQL::Grammar::Meta
       :DECIMAL_NEGATIVE,
       :DOUBLE_NEGATIVE],
     :DataValueTerm => [
-      "<<",
       :IRIREF,
       "true",
       "false",
+      "<<",
       :PNAME_LN,
       :PNAME_NS,
       :STRING_LITERAL1,
@@ -11121,94 +11121,18 @@ module SPARQL::Grammar::Meta
       "NAMED",
       "ALL",
       "GRAPH"],
-    :EmbSubjectOrObject => [
-      :VAR1,
-      :VAR2,
-      :BLANK_NODE_LABEL,
-      :ANON,
-      :IRIREF,
-      "true",
-      "false",
-      "<<",
-      :PNAME_LN,
-      :PNAME_NS,
-      :STRING_LITERAL1,
-      :STRING_LITERAL2,
-      :STRING_LITERAL_LONG1,
-      :STRING_LITERAL_LONG2,
-      :INTEGER,
-      :DECIMAL,
-      :DOUBLE,
-      :INTEGER_POSITIVE,
-      :DECIMAL_POSITIVE,
-      :DOUBLE_POSITIVE,
-      :INTEGER_NEGATIVE,
-      :DECIMAL_NEGATIVE,
-      :DOUBLE_NEGATIVE],
-    :EmbTD => [
+    :ExistsFunc => [
+      "EXISTS"],
+    :_ExistsFunc_1 => [
+      "{"],
+    :ExprQuotedTP => [
       "<<"],
-    :_EmbTD_1 => [
-      "a",
-      :IRIREF,
-      :PNAME_LN,
-      :PNAME_NS],
-    :_EmbTD_2 => [
-      "<<",
+    :_ExprQuotedTP_1 => [
       :IRIREF,
       "true",
       "false",
-      :PNAME_LN,
-      :PNAME_NS,
-      :STRING_LITERAL1,
-      :STRING_LITERAL2,
-      :STRING_LITERAL_LONG1,
-      :STRING_LITERAL_LONG2,
-      :INTEGER,
-      :DECIMAL,
-      :DOUBLE,
-      :INTEGER_POSITIVE,
-      :DECIMAL_POSITIVE,
-      :DOUBLE_POSITIVE,
-      :INTEGER_NEGATIVE,
-      :DECIMAL_NEGATIVE,
-      :DOUBLE_NEGATIVE],
-    :_EmbTD_3 => [
-      "a",
-      :IRIREF,
-      :PNAME_LN,
-      :PNAME_NS],
-    :_EmbTD_4 => [
-      "<<",
-      :IRIREF,
-      "true",
-      "false",
-      :PNAME_LN,
-      :PNAME_NS,
-      :STRING_LITERAL1,
-      :STRING_LITERAL2,
-      :STRING_LITERAL_LONG1,
-      :STRING_LITERAL_LONG2,
-      :INTEGER,
-      :DECIMAL,
-      :DOUBLE,
-      :INTEGER_POSITIVE,
-      :DECIMAL_POSITIVE,
-      :DOUBLE_POSITIVE,
-      :INTEGER_NEGATIVE,
-      :DECIMAL_NEGATIVE,
-      :DOUBLE_NEGATIVE],
-    :_EmbTD_5 => [
-      ">>"],
-    :EmbTP => [
-      "<<"],
-    :_EmbTP_1 => [
       :VAR1,
       :VAR2,
-      :BLANK_NODE_LABEL,
-      :ANON,
-      :IRIREF,
-      "true",
-      "false",
       "<<",
       :PNAME_LN,
       :PNAME_NS,
@@ -11225,21 +11149,19 @@ module SPARQL::Grammar::Meta
       :INTEGER_NEGATIVE,
       :DECIMAL_NEGATIVE,
       :DOUBLE_NEGATIVE],
-    :_EmbTP_2 => [
+    :_ExprQuotedTP_2 => [
       "a",
       :VAR1,
       :VAR2,
       :IRIREF,
       :PNAME_LN,
       :PNAME_NS],
-    :_EmbTP_3 => [
-      :VAR1,
-      :VAR2,
-      :BLANK_NODE_LABEL,
-      :ANON,
+    :_ExprQuotedTP_3 => [
       :IRIREF,
       "true",
       "false",
+      :VAR1,
+      :VAR2,
       "<<",
       :PNAME_LN,
       :PNAME_NS,
@@ -11256,50 +11178,15 @@ module SPARQL::Grammar::Meta
       :INTEGER_NEGATIVE,
       :DECIMAL_NEGATIVE,
       :DOUBLE_NEGATIVE],
-    :_EmbTP_4 => [
+    :_ExprQuotedTP_4 => [
       ">>"],
-    :ExistsFunc => [
-      "EXISTS"],
-    :_ExistsFunc_1 => [
-      "{"],
-    :ExprEmbTP => [
-      "<<"],
-    :_ExprEmbTP_1 => [
-      :VAR1,
-      :VAR2,
-      "<<",
+    :ExprVarOrTerm => [
       :IRIREF,
       "true",
       "false",
-      :PNAME_LN,
-      :PNAME_NS,
-      :STRING_LITERAL1,
-      :STRING_LITERAL2,
-      :STRING_LITERAL_LONG1,
-      :STRING_LITERAL_LONG2,
-      :INTEGER,
-      :DECIMAL,
-      :DOUBLE,
-      :INTEGER_POSITIVE,
-      :DECIMAL_POSITIVE,
-      :DOUBLE_POSITIVE,
-      :INTEGER_NEGATIVE,
-      :DECIMAL_NEGATIVE,
-      :DOUBLE_NEGATIVE],
-    :_ExprEmbTP_2 => [
-      "a",
-      :VAR1,
-      :VAR2,
-      :IRIREF,
-      :PNAME_LN,
-      :PNAME_NS],
-    :_ExprEmbTP_3 => [
       :VAR1,
       :VAR2,
       "<<",
-      :IRIREF,
-      "true",
-      "false",
       :PNAME_LN,
       :PNAME_NS,
       :STRING_LITERAL1,
@@ -11315,17 +11202,77 @@ module SPARQL::Grammar::Meta
       :INTEGER_NEGATIVE,
       :DECIMAL_NEGATIVE,
       :DOUBLE_NEGATIVE],
-    :_ExprEmbTP_4 => [
-      ">>"],
-    :ExprVarOrTerm => [
+    :Expression => [
+      "!",
+      "+",
+      "-",
       :VAR1,
       :VAR2,
-      "<<",
-      :IRIREF,
+      "(",
       "true",
       "false",
-      :PNAME_LN,
-      :PNAME_NS,
+      "<<",
+      "STR",
+      "LANG",
+      "LANGMATCHES",
+      "DATATYPE",
+      "BOUND",
+      "IRI",
+      "URI",
+      "BNODE",
+      "RAND",
+      "ABS",
+      "CEIL",
+      "FLOOR",
+      "ROUND",
+      "CONCAT",
+      "SUBSTR",
+      "STRLEN",
+      "REPLACE",
+      "UCASE",
+      "LCASE",
+      "ENCODE_FOR_URI",
+      "CONTAINS",
+      "STRSTARTS",
+      "STRENDS",
+      "STRBEFORE",
+      "STRAFTER",
+      "YEAR",
+      "MONTH",
+      "DAY",
+      "HOURS",
+      "MINUTES",
+      "SECONDS",
+      "TIMEZONE",
+      "TZ",
+      "NOW",
+      "UUID",
+      "STRUUID",
+      "MD5",
+      "SHA1",
+      "SHA224",
+      "SHA256",
+      "SHA384",
+      "SHA512",
+      "COALESCE",
+      "IF",
+      "STRLANG",
+      "STRDT",
+      "sameTerm",
+      "isIRI",
+      "isURI",
+      "isBLANK",
+      "isLITERAL",
+      "isNUMERIC",
+      "TRIPLE",
+      "SUBJECT",
+      "PREDICATE",
+      "OBJECT",
+      "isTRIPLE",
+      "REGEX",
+      "EXISTS",
+      "NOT",
+      :IRIREF,
       :STRING_LITERAL1,
       :STRING_LITERAL2,
       :STRING_LITERAL_LONG1,
@@ -11338,113 +11285,29 @@ module SPARQL::Grammar::Meta
       :DOUBLE_POSITIVE,
       :INTEGER_NEGATIVE,
       :DECIMAL_NEGATIVE,
-      :DOUBLE_NEGATIVE],
-    :Expression => [
-      "!",
-      "+",
-      "-",
-      :VAR1,
-      :VAR2,
-      "(",
-      "true",
-      "false",
-      "<<",
-      "STR",
-      "LANG",
-      "LANGMATCHES",
-      "DATATYPE",
-      "BOUND",
-      "IRI",
-      "URI",
-      "BNODE",
-      "RAND",
-      "ABS",
-      "CEIL",
-      "FLOOR",
-      "ROUND",
-      "CONCAT",
-      "SUBSTR",
-      "STRLEN",
-      "REPLACE",
-      "UCASE",
-      "LCASE",
-      "ENCODE_FOR_URI",
-      "CONTAINS",
-      "STRSTARTS",
-      "STRENDS",
-      "STRBEFORE",
-      "STRAFTER",
-      "YEAR",
-      "MONTH",
-      "DAY",
-      "HOURS",
-      "MINUTES",
-      "SECONDS",
-      "TIMEZONE",
-      "TZ",
-      "NOW",
-      "UUID",
-      "STRUUID",
-      "MD5",
-      "SHA1",
-      "SHA224",
-      "SHA256",
-      "SHA384",
-      "SHA512",
-      "COALESCE",
-      "IF",
-      "STRLANG",
-      "STRDT",
-      "sameTerm",
-      "isIRI",
-      "isURI",
-      "isBLANK",
-      "isLITERAL",
-      "isNUMERIC",
-      "TRIPLE",
-      "SUBJECT",
-      "PREDICATE",
-      "OBJECT",
-      "isTRIPLE",
-      "REGEX",
-      "EXISTS",
-      "NOT",
-      :IRIREF,
-      :STRING_LITERAL1,
-      :STRING_LITERAL2,
-      :STRING_LITERAL_LONG1,
-      :STRING_LITERAL_LONG2,
-      :INTEGER,
-      :DECIMAL,
-      :DOUBLE,
-      :INTEGER_POSITIVE,
-      :DECIMAL_POSITIVE,
-      :DOUBLE_POSITIVE,
-      :INTEGER_NEGATIVE,
-      :DECIMAL_NEGATIVE,
-      :DOUBLE_NEGATIVE,
-      "COUNT",
-      "SUM",
-      "MIN",
-      "MAX",
-      "AVG",
-      "SAMPLE",
-      "GROUP_CONCAT",
-      :PNAME_LN,
-      :PNAME_NS],
-    :ExpressionList => [
-      :NIL,
-      "("],
-    :_ExpressionList_1 => [
-      "("],
-    :_ExpressionList_2 => [
-      :_eps,
-      ","],
-    :_ExpressionList_3 => [
-      ","],
-    :_ExpressionList_4 => [
-      ","],
-    :_ExpressionList_5 => [
+      :DOUBLE_NEGATIVE,
+      "COUNT",
+      "SUM",
+      "MIN",
+      "MAX",
+      "AVG",
+      "SAMPLE",
+      "GROUP_CONCAT",
+      :PNAME_LN,
+      :PNAME_NS],
+    :ExpressionList => [
+      :NIL,
+      "("],
+    :_ExpressionList_1 => [
+      "("],
+    :_ExpressionList_2 => [
+      :_eps,
+      ","],
+    :_ExpressionList_3 => [
+      ","],
+    :_ExpressionList_4 => [
+      ","],
+    :_ExpressionList_5 => [
       "!",
       "+",
       "-",
@@ -15659,104 +15522,19 @@ module SPARQL::Grammar::Meta
       "DESCRIBE",
       "ASK",
       "SELECT"],
-    :RDFLiteral => [
-      :STRING_LITERAL1,
-      :STRING_LITERAL2,
-      :STRING_LITERAL_LONG1,
-      :STRING_LITERAL_LONG2],
-    :_RDFLiteral_1 => [
-      :_eps,
-      :LANGTAG,
-      "^^"],
-    :_RDFLiteral_2 => [
-      :LANGTAG,
-      "^^"],
-    :_RDFLiteral_3 => [
-      "^^"],
-    :_RDFLiteral_4 => [
-      :LANGTAG,
-      :_eps,
-      "^^"],
-    :RegexExpression => [
-      "REGEX"],
-    :_RegexExpression_1 => [
-      :_eps,
-      ","],
-    :_RegexExpression_2 => [
-      ","],
-    :_RegexExpression_3 => [
-      "("],
-    :_RegexExpression_4 => [
-      "!",
-      "+",
-      "-",
+    :QuotedTP => [
+      "<<"],
+    :_QuotedTP_1 => [
       :VAR1,
       :VAR2,
-      "(",
+      :BLANK_NODE_LABEL,
+      :ANON,
+      :IRIREF,
       "true",
       "false",
       "<<",
-      "STR",
-      "LANG",
-      "LANGMATCHES",
-      "DATATYPE",
-      "BOUND",
-      "IRI",
-      "URI",
-      "BNODE",
-      "RAND",
-      "ABS",
-      "CEIL",
-      "FLOOR",
-      "ROUND",
-      "CONCAT",
-      "SUBSTR",
-      "STRLEN",
-      "REPLACE",
-      "UCASE",
-      "LCASE",
-      "ENCODE_FOR_URI",
-      "CONTAINS",
-      "STRSTARTS",
-      "STRENDS",
-      "STRBEFORE",
-      "STRAFTER",
-      "YEAR",
-      "MONTH",
-      "DAY",
-      "HOURS",
-      "MINUTES",
-      "SECONDS",
-      "TIMEZONE",
-      "TZ",
-      "NOW",
-      "UUID",
-      "STRUUID",
-      "MD5",
-      "SHA1",
-      "SHA224",
-      "SHA256",
-      "SHA384",
-      "SHA512",
-      "COALESCE",
-      "IF",
-      "STRLANG",
-      "STRDT",
-      "sameTerm",
-      "isIRI",
-      "isURI",
-      "isBLANK",
-      "isLITERAL",
-      "isNUMERIC",
-      "TRIPLE",
-      "SUBJECT",
-      "PREDICATE",
-      "OBJECT",
-      "isTRIPLE",
-      "REGEX",
-      "EXISTS",
-      "NOT",
-      :IRIREF,
+      :PNAME_LN,
+      :PNAME_NS,
       :STRING_LITERAL1,
       :STRING_LITERAL2,
       :STRING_LITERAL_LONG1,
@@ -15769,87 +15547,54 @@ module SPARQL::Grammar::Meta
       :DOUBLE_POSITIVE,
       :INTEGER_NEGATIVE,
       :DECIMAL_NEGATIVE,
-      :DOUBLE_NEGATIVE,
-      "COUNT",
-      "SUM",
-      "MIN",
-      "MAX",
-      "AVG",
-      "SAMPLE",
-      "GROUP_CONCAT",
+      :DOUBLE_NEGATIVE],
+    :_QuotedTP_2 => [
+      "a",
+      :VAR1,
+      :VAR2,
+      :IRIREF,
       :PNAME_LN,
       :PNAME_NS],
-    :_RegexExpression_5 => [
-      "!",
-      "+",
-      "-",
+    :_QuotedTP_3 => [
       :VAR1,
       :VAR2,
-      "(",
+      :BLANK_NODE_LABEL,
+      :ANON,
+      :IRIREF,
       "true",
       "false",
       "<<",
-      "STR",
-      "LANG",
-      "LANGMATCHES",
-      "DATATYPE",
-      "BOUND",
-      "IRI",
-      "URI",
-      "BNODE",
-      "RAND",
-      "ABS",
-      "CEIL",
-      "FLOOR",
-      "ROUND",
-      "CONCAT",
-      "SUBSTR",
-      "STRLEN",
-      "REPLACE",
-      "UCASE",
-      "LCASE",
-      "ENCODE_FOR_URI",
-      "CONTAINS",
-      "STRSTARTS",
-      "STRENDS",
-      "STRBEFORE",
-      "STRAFTER",
-      "YEAR",
-      "MONTH",
-      "DAY",
-      "HOURS",
-      "MINUTES",
-      "SECONDS",
-      "TIMEZONE",
-      "TZ",
-      "NOW",
-      "UUID",
-      "STRUUID",
-      "MD5",
-      "SHA1",
-      "SHA224",
-      "SHA256",
-      "SHA384",
-      "SHA512",
-      "COALESCE",
-      "IF",
-      "STRLANG",
-      "STRDT",
-      "sameTerm",
-      "isIRI",
-      "isURI",
-      "isBLANK",
-      "isLITERAL",
-      "isNUMERIC",
-      "TRIPLE",
-      "SUBJECT",
-      "PREDICATE",
-      "OBJECT",
-      "isTRIPLE",
-      "REGEX",
-      "EXISTS",
-      "NOT",
+      :PNAME_LN,
+      :PNAME_NS,
+      :STRING_LITERAL1,
+      :STRING_LITERAL2,
+      :STRING_LITERAL_LONG1,
+      :STRING_LITERAL_LONG2,
+      :INTEGER,
+      :DECIMAL,
+      :DOUBLE,
+      :INTEGER_POSITIVE,
+      :DECIMAL_POSITIVE,
+      :DOUBLE_POSITIVE,
+      :INTEGER_NEGATIVE,
+      :DECIMAL_NEGATIVE,
+      :DOUBLE_NEGATIVE],
+    :_QuotedTP_4 => [
+      ">>"],
+    :QuotedTriple => [
+      "<<"],
+    :_QuotedTriple_1 => [
+      "a",
+      :IRIREF,
+      :PNAME_LN,
+      :PNAME_NS],
+    :_QuotedTriple_2 => [
       :IRIREF,
+      "true",
+      "false",
+      "<<",
+      :PNAME_LN,
+      :PNAME_NS,
       :STRING_LITERAL1,
       :STRING_LITERAL2,
       :STRING_LITERAL_LONG1,
@@ -15862,19 +15607,62 @@ module SPARQL::Grammar::Meta
       :DOUBLE_POSITIVE,
       :INTEGER_NEGATIVE,
       :DECIMAL_NEGATIVE,
-      :DOUBLE_NEGATIVE,
-      "COUNT",
-      "SUM",
-      "MIN",
-      "MAX",
-      "AVG",
-      "SAMPLE",
-      "GROUP_CONCAT",
+      :DOUBLE_NEGATIVE],
+    :_QuotedTriple_3 => [
+      "a",
+      :IRIREF,
       :PNAME_LN,
       :PNAME_NS],
-    :_RegexExpression_6 => [
+    :_QuotedTriple_4 => [
+      :IRIREF,
+      "true",
+      "false",
+      "<<",
+      :PNAME_LN,
+      :PNAME_NS,
+      :STRING_LITERAL1,
+      :STRING_LITERAL2,
+      :STRING_LITERAL_LONG1,
+      :STRING_LITERAL_LONG2,
+      :INTEGER,
+      :DECIMAL,
+      :DOUBLE,
+      :INTEGER_POSITIVE,
+      :DECIMAL_POSITIVE,
+      :DOUBLE_POSITIVE,
+      :INTEGER_NEGATIVE,
+      :DECIMAL_NEGATIVE,
+      :DOUBLE_NEGATIVE],
+    :_QuotedTriple_5 => [
+      ">>"],
+    :RDFLiteral => [
+      :STRING_LITERAL1,
+      :STRING_LITERAL2,
+      :STRING_LITERAL_LONG1,
+      :STRING_LITERAL_LONG2],
+    :_RDFLiteral_1 => [
+      :_eps,
+      :LANGTAG,
+      "^^"],
+    :_RDFLiteral_2 => [
+      :LANGTAG,
+      "^^"],
+    :_RDFLiteral_3 => [
+      "^^"],
+    :_RDFLiteral_4 => [
+      :LANGTAG,
+      :_eps,
+      "^^"],
+    :RegexExpression => [
+      "REGEX"],
+    :_RegexExpression_1 => [
+      :_eps,
       ","],
-    :_RegexExpression_7 => [
+    :_RegexExpression_2 => [
+      ","],
+    :_RegexExpression_3 => [
+      "("],
+    :_RegexExpression_4 => [
       "!",
       "+",
       "-",
@@ -15967,10 +15755,7 @@ module SPARQL::Grammar::Meta
       "GROUP_CONCAT",
       :PNAME_LN,
       :PNAME_NS],
-    :_RegexExpression_8 => [
-      ",",
-      ")"],
-    :RelationalExpression => [
+    :_RegexExpression_5 => [
       "!",
       "+",
       "-",
@@ -16063,29 +15848,9 @@ module SPARQL::Grammar::Meta
       "GROUP_CONCAT",
       :PNAME_LN,
       :PNAME_NS],
-    :_RelationalExpression_1 => [
-      :_eps,
-      "=",
-      "!=",
-      "<",
-      ">",
-      "<=",
-      ">=",
-      "IN",
-      "NOT"],
-    :_RelationalExpression_10 => [
-      "NOT"],
-    :_RelationalExpression_11 => [
-      :_eps,
-      "=",
-      "!=",
-      "<",
-      ">",
-      "<=",
-      ">=",
-      "IN",
-      "NOT"],
-    :_RelationalExpression_12 => [
+    :_RegexExpression_6 => [
+      ","],
+    :_RegexExpression_7 => [
       "!",
       "+",
       "-",
@@ -16178,7 +15943,10 @@ module SPARQL::Grammar::Meta
       "GROUP_CONCAT",
       :PNAME_LN,
       :PNAME_NS],
-    :_RelationalExpression_13 => [
+    :_RegexExpression_8 => [
+      ",",
+      ")"],
+    :RelationalExpression => [
       "!",
       "+",
       "-",
@@ -16271,7 +16039,29 @@ module SPARQL::Grammar::Meta
       "GROUP_CONCAT",
       :PNAME_LN,
       :PNAME_NS],
-    :_RelationalExpression_14 => [
+    :_RelationalExpression_1 => [
+      :_eps,
+      "=",
+      "!=",
+      "<",
+      ">",
+      "<=",
+      ">=",
+      "IN",
+      "NOT"],
+    :_RelationalExpression_10 => [
+      "NOT"],
+    :_RelationalExpression_11 => [
+      :_eps,
+      "=",
+      "!=",
+      "<",
+      ">",
+      "<=",
+      ">=",
+      "IN",
+      "NOT"],
+    :_RelationalExpression_12 => [
       "!",
       "+",
       "-",
@@ -16364,7 +16154,7 @@ module SPARQL::Grammar::Meta
       "GROUP_CONCAT",
       :PNAME_LN,
       :PNAME_NS],
-    :_RelationalExpression_15 => [
+    :_RelationalExpression_13 => [
       "!",
       "+",
       "-",
@@ -16457,7 +16247,7 @@ module SPARQL::Grammar::Meta
       "GROUP_CONCAT",
       :PNAME_LN,
       :PNAME_NS],
-    :_RelationalExpression_16 => [
+    :_RelationalExpression_14 => [
       "!",
       "+",
       "-",
@@ -16550,7 +16340,7 @@ module SPARQL::Grammar::Meta
       "GROUP_CONCAT",
       :PNAME_LN,
       :PNAME_NS],
-    :_RelationalExpression_17 => [
+    :_RelationalExpression_15 => [
       "!",
       "+",
       "-",
@@ -16643,49 +16433,7 @@ module SPARQL::Grammar::Meta
       "GROUP_CONCAT",
       :PNAME_LN,
       :PNAME_NS],
-    :_RelationalExpression_18 => [
-      :NIL,
-      "("],
-    :_RelationalExpression_2 => [
-      "=",
-      "!=",
-      "<",
-      ">",
-      "<=",
-      ">=",
-      "IN",
-      "NOT"],
-    :_RelationalExpression_3 => [
-      "="],
-    :_RelationalExpression_4 => [
-      "!="],
-    :_RelationalExpression_5 => [
-      "<"],
-    :_RelationalExpression_6 => [
-      ">"],
-    :_RelationalExpression_7 => [
-      "<="],
-    :_RelationalExpression_8 => [
-      ">="],
-    :_RelationalExpression_9 => [
-      "IN"],
-    :SelectClause => [
-      "SELECT"],
-    :_SelectClause_1 => [
-      :_eps,
-      "DISTINCT",
-      "REDUCED"],
-    :_SelectClause_10 => [
-      :_eps,
-      :VAR1,
-      :VAR2,
-      "("],
-    :_SelectClause_11 => [
-      :_eps,
-      :VAR1,
-      :VAR2,
-      "("],
-    :_SelectClause_12 => [
+    :_RelationalExpression_16 => [
       "!",
       "+",
       "-",
@@ -16778,125 +16526,7 @@ module SPARQL::Grammar::Meta
       "GROUP_CONCAT",
       :PNAME_LN,
       :PNAME_NS],
-    :_SelectClause_13 => [
-      "*",
-      :VAR1,
-      :VAR2,
-      "("],
-    :_SelectClause_14 => [
-      "AS"],
-    :_SelectClause_2 => [
-      "*",
-      :VAR1,
-      :VAR2,
-      "("],
-    :_SelectClause_3 => [
-      "DISTINCT",
-      "REDUCED"],
-    :_SelectClause_4 => [
-      :VAR1,
-      :VAR2,
-      "("],
-    :_SelectClause_5 => [
-      :VAR1,
-      :VAR2,
-      "("],
-    :_SelectClause_6 => [
-      :_eps,
-      :VAR1,
-      :VAR2,
-      "("],
-    :_SelectClause_7 => [
-      :VAR1,
-      :VAR2,
-      "("],
-    :_SelectClause_8 => [
-      "("],
-    :_SelectClause_9 => [
-      "DISTINCT",
-      "REDUCED",
-      "*",
-      :VAR1,
-      :VAR2,
-      "("],
-    :SelectQuery => [
-      "SELECT"],
-    :_SelectQuery_1 => [
-      :_eps,
-      "FROM"],
-    :_SelectQuery_2 => [
-      "FROM"],
-    :_SelectQuery_3 => [
-      "FROM",
-      "WHERE",
-      "{"],
-    :_SelectQuery_4 => [
-      :_eps,
-      "FROM"],
-    :ServiceGraphPattern => [
-      "SERVICE"],
-    :_ServiceGraphPattern_1 => [
-      "SILENT",
-      :_eps],
-    :_ServiceGraphPattern_2 => [
-      "SILENT",
-      :VAR1,
-      :VAR2,
-      :IRIREF,
-      :PNAME_LN,
-      :PNAME_NS],
-    :SolutionModifier => [
-      "GROUP",
-      "HAVING",
-      "ORDER",
-      :_eps,
-      "LIMIT",
-      "OFFSET"],
-    :_SolutionModifier_1 => [
-      :_eps,
-      "GROUP"],
-    :_SolutionModifier_2 => [
-      :_eps,
-      "HAVING"],
-    :_SolutionModifier_3 => [
-      :_eps,
-      "ORDER"],
-    :_SolutionModifier_4 => [
-      :_eps,
-      "LIMIT",
-      "OFFSET"],
-    :_SolutionModifier_5 => [
-      "HAVING",
-      "ORDER",
-      :_eps,
-      "LIMIT",
-      "OFFSET"],
-    :_SolutionModifier_6 => [
-      "ORDER",
-      :_eps,
-      "LIMIT",
-      "OFFSET"],
-    :_SolutionModifier_7 => [
-      :_eps,
-      "LIMIT",
-      "OFFSET"],
-    :SourceSelector => [
-      :IRIREF,
-      :PNAME_LN,
-      :PNAME_NS],
-    :StrReplaceExpression => [
-      "REPLACE"],
-    :_StrReplaceExpression_1 => [
-      :_eps,
-      ","],
-    :_StrReplaceExpression_10 => [
-      ",",
-      ")"],
-    :_StrReplaceExpression_2 => [
-      ","],
-    :_StrReplaceExpression_3 => [
-      "("],
-    :_StrReplaceExpression_4 => [
+    :_RelationalExpression_17 => [
       "!",
       "+",
       "-",
@@ -16989,7 +16619,353 @@ module SPARQL::Grammar::Meta
       "GROUP_CONCAT",
       :PNAME_LN,
       :PNAME_NS],
-    :_StrReplaceExpression_5 => [
+    :_RelationalExpression_18 => [
+      :NIL,
+      "("],
+    :_RelationalExpression_2 => [
+      "=",
+      "!=",
+      "<",
+      ">",
+      "<=",
+      ">=",
+      "IN",
+      "NOT"],
+    :_RelationalExpression_3 => [
+      "="],
+    :_RelationalExpression_4 => [
+      "!="],
+    :_RelationalExpression_5 => [
+      "<"],
+    :_RelationalExpression_6 => [
+      ">"],
+    :_RelationalExpression_7 => [
+      "<="],
+    :_RelationalExpression_8 => [
+      ">="],
+    :_RelationalExpression_9 => [
+      "IN"],
+    :SelectClause => [
+      "SELECT"],
+    :_SelectClause_1 => [
+      :_eps,
+      "DISTINCT",
+      "REDUCED"],
+    :_SelectClause_10 => [
+      :_eps,
+      :VAR1,
+      :VAR2,
+      "("],
+    :_SelectClause_11 => [
+      :_eps,
+      :VAR1,
+      :VAR2,
+      "("],
+    :_SelectClause_12 => [
+      "!",
+      "+",
+      "-",
+      :VAR1,
+      :VAR2,
+      "(",
+      "true",
+      "false",
+      "<<",
+      "STR",
+      "LANG",
+      "LANGMATCHES",
+      "DATATYPE",
+      "BOUND",
+      "IRI",
+      "URI",
+      "BNODE",
+      "RAND",
+      "ABS",
+      "CEIL",
+      "FLOOR",
+      "ROUND",
+      "CONCAT",
+      "SUBSTR",
+      "STRLEN",
+      "REPLACE",
+      "UCASE",
+      "LCASE",
+      "ENCODE_FOR_URI",
+      "CONTAINS",
+      "STRSTARTS",
+      "STRENDS",
+      "STRBEFORE",
+      "STRAFTER",
+      "YEAR",
+      "MONTH",
+      "DAY",
+      "HOURS",
+      "MINUTES",
+      "SECONDS",
+      "TIMEZONE",
+      "TZ",
+      "NOW",
+      "UUID",
+      "STRUUID",
+      "MD5",
+      "SHA1",
+      "SHA224",
+      "SHA256",
+      "SHA384",
+      "SHA512",
+      "COALESCE",
+      "IF",
+      "STRLANG",
+      "STRDT",
+      "sameTerm",
+      "isIRI",
+      "isURI",
+      "isBLANK",
+      "isLITERAL",
+      "isNUMERIC",
+      "TRIPLE",
+      "SUBJECT",
+      "PREDICATE",
+      "OBJECT",
+      "isTRIPLE",
+      "REGEX",
+      "EXISTS",
+      "NOT",
+      :IRIREF,
+      :STRING_LITERAL1,
+      :STRING_LITERAL2,
+      :STRING_LITERAL_LONG1,
+      :STRING_LITERAL_LONG2,
+      :INTEGER,
+      :DECIMAL,
+      :DOUBLE,
+      :INTEGER_POSITIVE,
+      :DECIMAL_POSITIVE,
+      :DOUBLE_POSITIVE,
+      :INTEGER_NEGATIVE,
+      :DECIMAL_NEGATIVE,
+      :DOUBLE_NEGATIVE,
+      "COUNT",
+      "SUM",
+      "MIN",
+      "MAX",
+      "AVG",
+      "SAMPLE",
+      "GROUP_CONCAT",
+      :PNAME_LN,
+      :PNAME_NS],
+    :_SelectClause_13 => [
+      "*",
+      :VAR1,
+      :VAR2,
+      "("],
+    :_SelectClause_14 => [
+      "AS"],
+    :_SelectClause_2 => [
+      "*",
+      :VAR1,
+      :VAR2,
+      "("],
+    :_SelectClause_3 => [
+      "DISTINCT",
+      "REDUCED"],
+    :_SelectClause_4 => [
+      :VAR1,
+      :VAR2,
+      "("],
+    :_SelectClause_5 => [
+      :VAR1,
+      :VAR2,
+      "("],
+    :_SelectClause_6 => [
+      :_eps,
+      :VAR1,
+      :VAR2,
+      "("],
+    :_SelectClause_7 => [
+      :VAR1,
+      :VAR2,
+      "("],
+    :_SelectClause_8 => [
+      "("],
+    :_SelectClause_9 => [
+      "DISTINCT",
+      "REDUCED",
+      "*",
+      :VAR1,
+      :VAR2,
+      "("],
+    :SelectQuery => [
+      "SELECT"],
+    :_SelectQuery_1 => [
+      :_eps,
+      "FROM"],
+    :_SelectQuery_2 => [
+      "FROM"],
+    :_SelectQuery_3 => [
+      "FROM",
+      "WHERE",
+      "{"],
+    :_SelectQuery_4 => [
+      :_eps,
+      "FROM"],
+    :ServiceGraphPattern => [
+      "SERVICE"],
+    :_ServiceGraphPattern_1 => [
+      "SILENT",
+      :_eps],
+    :_ServiceGraphPattern_2 => [
+      "SILENT",
+      :VAR1,
+      :VAR2,
+      :IRIREF,
+      :PNAME_LN,
+      :PNAME_NS],
+    :SolutionModifier => [
+      "GROUP",
+      "HAVING",
+      "ORDER",
+      :_eps,
+      "LIMIT",
+      "OFFSET"],
+    :_SolutionModifier_1 => [
+      :_eps,
+      "GROUP"],
+    :_SolutionModifier_2 => [
+      :_eps,
+      "HAVING"],
+    :_SolutionModifier_3 => [
+      :_eps,
+      "ORDER"],
+    :_SolutionModifier_4 => [
+      :_eps,
+      "LIMIT",
+      "OFFSET"],
+    :_SolutionModifier_5 => [
+      "HAVING",
+      "ORDER",
+      :_eps,
+      "LIMIT",
+      "OFFSET"],
+    :_SolutionModifier_6 => [
+      "ORDER",
+      :_eps,
+      "LIMIT",
+      "OFFSET"],
+    :_SolutionModifier_7 => [
+      :_eps,
+      "LIMIT",
+      "OFFSET"],
+    :SourceSelector => [
+      :IRIREF,
+      :PNAME_LN,
+      :PNAME_NS],
+    :StrReplaceExpression => [
+      "REPLACE"],
+    :_StrReplaceExpression_1 => [
+      :_eps,
+      ","],
+    :_StrReplaceExpression_10 => [
+      ",",
+      ")"],
+    :_StrReplaceExpression_2 => [
+      ","],
+    :_StrReplaceExpression_3 => [
+      "("],
+    :_StrReplaceExpression_4 => [
+      "!",
+      "+",
+      "-",
+      :VAR1,
+      :VAR2,
+      "(",
+      "true",
+      "false",
+      "<<",
+      "STR",
+      "LANG",
+      "LANGMATCHES",
+      "DATATYPE",
+      "BOUND",
+      "IRI",
+      "URI",
+      "BNODE",
+      "RAND",
+      "ABS",
+      "CEIL",
+      "FLOOR",
+      "ROUND",
+      "CONCAT",
+      "SUBSTR",
+      "STRLEN",
+      "REPLACE",
+      "UCASE",
+      "LCASE",
+      "ENCODE_FOR_URI",
+      "CONTAINS",
+      "STRSTARTS",
+      "STRENDS",
+      "STRBEFORE",
+      "STRAFTER",
+      "YEAR",
+      "MONTH",
+      "DAY",
+      "HOURS",
+      "MINUTES",
+      "SECONDS",
+      "TIMEZONE",
+      "TZ",
+      "NOW",
+      "UUID",
+      "STRUUID",
+      "MD5",
+      "SHA1",
+      "SHA224",
+      "SHA256",
+      "SHA384",
+      "SHA512",
+      "COALESCE",
+      "IF",
+      "STRLANG",
+      "STRDT",
+      "sameTerm",
+      "isIRI",
+      "isURI",
+      "isBLANK",
+      "isLITERAL",
+      "isNUMERIC",
+      "TRIPLE",
+      "SUBJECT",
+      "PREDICATE",
+      "OBJECT",
+      "isTRIPLE",
+      "REGEX",
+      "EXISTS",
+      "NOT",
+      :IRIREF,
+      :STRING_LITERAL1,
+      :STRING_LITERAL2,
+      :STRING_LITERAL_LONG1,
+      :STRING_LITERAL_LONG2,
+      :INTEGER,
+      :DECIMAL,
+      :DOUBLE,
+      :INTEGER_POSITIVE,
+      :DECIMAL_POSITIVE,
+      :DOUBLE_POSITIVE,
+      :INTEGER_NEGATIVE,
+      :DECIMAL_NEGATIVE,
+      :DOUBLE_NEGATIVE,
+      "COUNT",
+      "SUM",
+      "MIN",
+      "MAX",
+      "AVG",
+      "SAMPLE",
+      "GROUP_CONCAT",
+      :PNAME_LN,
+      :PNAME_NS],
+    :_StrReplaceExpression_5 => [
       "!",
       "+",
       "-",
@@ -18536,7 +18512,7 @@ module SPARQL::Grammar::Meta
       :INTEGER_NEGATIVE,
       :DECIMAL_NEGATIVE,
       :DOUBLE_NEGATIVE],
-    :VarOrTermOrEmbTP => [
+    :VarOrTermOrQuotedTP => [
       :VAR1,
       :VAR2,
       :NIL,
@@ -18605,6 +18581,30 @@ module SPARQL::Grammar::Meta
       :NIL,
       "(",
       :_eps],
+    :qtSubjectOrObject => [
+      :VAR1,
+      :VAR2,
+      :BLANK_NODE_LABEL,
+      :ANON,
+      :IRIREF,
+      "true",
+      "false",
+      "<<",
+      :PNAME_LN,
+      :PNAME_NS,
+      :STRING_LITERAL1,
+      :STRING_LITERAL2,
+      :STRING_LITERAL_LONG1,
+      :STRING_LITERAL_LONG2,
+      :INTEGER,
+      :DECIMAL,
+      :DOUBLE,
+      :INTEGER_POSITIVE,
+      :DECIMAL_POSITIVE,
+      :DOUBLE_POSITIVE,
+      :INTEGER_NEGATIVE,
+      :DECIMAL_NEGATIVE,
+      :DOUBLE_NEGATIVE],
   }.freeze
   FOLLOW = {
     :Add => [
@@ -38503,394 +38503,6 @@ module SPARQL::Grammar::Meta
     :_Drop_3 => [
       ";",
       :_eof],
-    :EmbSubjectOrObject => [
-      "a",
-      ">>",
-      :VAR1,
-      :VAR2,
-      :IRIREF,
-      :PNAME_LN,
-      :PNAME_NS],
-    :EmbTD => [
-      "}",
-      ")",
-      "a",
-      :IRIREF,
-      ">>",
-      "UNDEF",
-      :PNAME_LN,
-      :PNAME_NS,
-      "<<",
-      "true",
-      "false",
-      :STRING_LITERAL1,
-      :STRING_LITERAL2,
-      :STRING_LITERAL_LONG1,
-      :STRING_LITERAL_LONG2,
-      :INTEGER,
-      :DECIMAL,
-      :DOUBLE,
-      :INTEGER_POSITIVE,
-      :DECIMAL_POSITIVE,
-      :DOUBLE_POSITIVE,
-      :INTEGER_NEGATIVE,
-      :DECIMAL_NEGATIVE,
-      :DOUBLE_NEGATIVE],
-    :_EmbTD_1 => [
-      "<<",
-      :IRIREF,
-      "true",
-      "false",
-      :PNAME_LN,
-      :PNAME_NS,
-      :STRING_LITERAL1,
-      :STRING_LITERAL2,
-      :STRING_LITERAL_LONG1,
-      :STRING_LITERAL_LONG2,
-      :INTEGER,
-      :DECIMAL,
-      :DOUBLE,
-      :INTEGER_POSITIVE,
-      :DECIMAL_POSITIVE,
-      :DOUBLE_POSITIVE,
-      :INTEGER_NEGATIVE,
-      :DECIMAL_NEGATIVE,
-      :DOUBLE_NEGATIVE],
-    :_EmbTD_2 => [
-      "}",
-      ")",
-      "a",
-      :IRIREF,
-      ">>",
-      "UNDEF",
-      :PNAME_LN,
-      :PNAME_NS,
-      "<<",
-      "true",
-      "false",
-      :STRING_LITERAL1,
-      :STRING_LITERAL2,
-      :STRING_LITERAL_LONG1,
-      :STRING_LITERAL_LONG2,
-      :INTEGER,
-      :DECIMAL,
-      :DOUBLE,
-      :INTEGER_POSITIVE,
-      :DECIMAL_POSITIVE,
-      :DOUBLE_POSITIVE,
-      :INTEGER_NEGATIVE,
-      :DECIMAL_NEGATIVE,
-      :DOUBLE_NEGATIVE],
-    :_EmbTD_3 => [
-      "}",
-      ")",
-      "a",
-      :IRIREF,
-      ">>",
-      "UNDEF",
-      :PNAME_LN,
-      :PNAME_NS,
-      "<<",
-      "true",
-      "false",
-      :STRING_LITERAL1,
-      :STRING_LITERAL2,
-      :STRING_LITERAL_LONG1,
-      :STRING_LITERAL_LONG2,
-      :INTEGER,
-      :DECIMAL,
-      :DOUBLE,
-      :INTEGER_POSITIVE,
-      :DECIMAL_POSITIVE,
-      :DOUBLE_POSITIVE,
-      :INTEGER_NEGATIVE,
-      :DECIMAL_NEGATIVE,
-      :DOUBLE_NEGATIVE],
-    :_EmbTD_4 => [
-      "}",
-      ")",
-      "a",
-      :IRIREF,
-      ">>",
-      "UNDEF",
-      :PNAME_LN,
-      :PNAME_NS,
-      "<<",
-      "true",
-      "false",
-      :STRING_LITERAL1,
-      :STRING_LITERAL2,
-      :STRING_LITERAL_LONG1,
-      :STRING_LITERAL_LONG2,
-      :INTEGER,
-      :DECIMAL,
-      :DOUBLE,
-      :INTEGER_POSITIVE,
-      :DECIMAL_POSITIVE,
-      :DOUBLE_POSITIVE,
-      :INTEGER_NEGATIVE,
-      :DECIMAL_NEGATIVE,
-      :DOUBLE_NEGATIVE],
-    :_EmbTD_5 => [
-      "}",
-      ")",
-      "a",
-      :IRIREF,
-      ">>",
-      "UNDEF",
-      :PNAME_LN,
-      :PNAME_NS,
-      "<<",
-      "true",
-      "false",
-      :STRING_LITERAL1,
-      :STRING_LITERAL2,
-      :STRING_LITERAL_LONG1,
-      :STRING_LITERAL_LONG2,
-      :INTEGER,
-      :DECIMAL,
-      :DOUBLE,
-      :INTEGER_POSITIVE,
-      :DECIMAL_POSITIVE,
-      :DOUBLE_POSITIVE,
-      :INTEGER_NEGATIVE,
-      :DECIMAL_NEGATIVE,
-      :DOUBLE_NEGATIVE],
-    :EmbTP => [
-      "a",
-      ">>",
-      "{|",
-      ")",
-      ",",
-      "]",
-      "|}",
-      :VAR1,
-      :VAR2,
-      :IRIREF,
-      ";",
-      ".",
-      "}",
-      :NIL,
-      "<<",
-      "(",
-      "[",
-      :PNAME_LN,
-      :PNAME_NS,
-      "true",
-      "false",
-      :BLANK_NODE_LABEL,
-      :ANON,
-      "GRAPH",
-      :STRING_LITERAL1,
-      :STRING_LITERAL2,
-      :STRING_LITERAL_LONG1,
-      :STRING_LITERAL_LONG2,
-      :INTEGER,
-      :DECIMAL,
-      :DOUBLE,
-      :INTEGER_POSITIVE,
-      :DECIMAL_POSITIVE,
-      :DOUBLE_POSITIVE,
-      :INTEGER_NEGATIVE,
-      :DECIMAL_NEGATIVE,
-      :DOUBLE_NEGATIVE,
-      "{",
-      "OPTIONAL",
-      "MINUS",
-      "SERVICE",
-      "FILTER",
-      "BIND",
-      "VALUES",
-      "^",
-      "!"],
-    :_EmbTP_1 => [
-      "a",
-      ">>",
-      "{|",
-      ")",
-      ",",
-      "]",
-      "|}",
-      :VAR1,
-      :VAR2,
-      :IRIREF,
-      ";",
-      ".",
-      "}",
-      :NIL,
-      "<<",
-      "(",
-      "[",
-      :PNAME_LN,
-      :PNAME_NS,
-      "true",
-      "false",
-      :BLANK_NODE_LABEL,
-      :ANON,
-      "GRAPH",
-      :STRING_LITERAL1,
-      :STRING_LITERAL2,
-      :STRING_LITERAL_LONG1,
-      :STRING_LITERAL_LONG2,
-      :INTEGER,
-      :DECIMAL,
-      :DOUBLE,
-      :INTEGER_POSITIVE,
-      :DECIMAL_POSITIVE,
-      :DOUBLE_POSITIVE,
-      :INTEGER_NEGATIVE,
-      :DECIMAL_NEGATIVE,
-      :DOUBLE_NEGATIVE,
-      "{",
-      "OPTIONAL",
-      "MINUS",
-      "SERVICE",
-      "FILTER",
-      "BIND",
-      "VALUES",
-      "^",
-      "!"],
-    :_EmbTP_2 => [
-      "a",
-      ">>",
-      "{|",
-      ")",
-      ",",
-      "]",
-      "|}",
-      :VAR1,
-      :VAR2,
-      :IRIREF,
-      ";",
-      ".",
-      "}",
-      :NIL,
-      "<<",
-      "(",
-      "[",
-      :PNAME_LN,
-      :PNAME_NS,
-      "true",
-      "false",
-      :BLANK_NODE_LABEL,
-      :ANON,
-      "GRAPH",
-      :STRING_LITERAL1,
-      :STRING_LITERAL2,
-      :STRING_LITERAL_LONG1,
-      :STRING_LITERAL_LONG2,
-      :INTEGER,
-      :DECIMAL,
-      :DOUBLE,
-      :INTEGER_POSITIVE,
-      :DECIMAL_POSITIVE,
-      :DOUBLE_POSITIVE,
-      :INTEGER_NEGATIVE,
-      :DECIMAL_NEGATIVE,
-      :DOUBLE_NEGATIVE,
-      "{",
-      "OPTIONAL",
-      "MINUS",
-      "SERVICE",
-      "FILTER",
-      "BIND",
-      "VALUES",
-      "^",
-      "!"],
-    :_EmbTP_3 => [
-      "a",
-      ">>",
-      "{|",
-      ")",
-      ",",
-      "]",
-      "|}",
-      :VAR1,
-      :VAR2,
-      :IRIREF,
-      ";",
-      ".",
-      "}",
-      :NIL,
-      "<<",
-      "(",
-      "[",
-      :PNAME_LN,
-      :PNAME_NS,
-      "true",
-      "false",
-      :BLANK_NODE_LABEL,
-      :ANON,
-      "GRAPH",
-      :STRING_LITERAL1,
-      :STRING_LITERAL2,
-      :STRING_LITERAL_LONG1,
-      :STRING_LITERAL_LONG2,
-      :INTEGER,
-      :DECIMAL,
-      :DOUBLE,
-      :INTEGER_POSITIVE,
-      :DECIMAL_POSITIVE,
-      :DOUBLE_POSITIVE,
-      :INTEGER_NEGATIVE,
-      :DECIMAL_NEGATIVE,
-      :DOUBLE_NEGATIVE,
-      "{",
-      "OPTIONAL",
-      "MINUS",
-      "SERVICE",
-      "FILTER",
-      "BIND",
-      "VALUES",
-      "^",
-      "!"],
-    :_EmbTP_4 => [
-      "a",
-      ">>",
-      "{|",
-      ")",
-      ",",
-      "]",
-      "|}",
-      :VAR1,
-      :VAR2,
-      :IRIREF,
-      ";",
-      ".",
-      "}",
-      :NIL,
-      "<<",
-      "(",
-      "[",
-      :PNAME_LN,
-      :PNAME_NS,
-      "true",
-      "false",
-      :BLANK_NODE_LABEL,
-      :ANON,
-      "GRAPH",
-      :STRING_LITERAL1,
-      :STRING_LITERAL2,
-      :STRING_LITERAL_LONG1,
-      :STRING_LITERAL_LONG2,
-      :INTEGER,
-      :DECIMAL,
-      :DOUBLE,
-      :INTEGER_POSITIVE,
-      :DECIMAL_POSITIVE,
-      :DOUBLE_POSITIVE,
-      :INTEGER_NEGATIVE,
-      :DECIMAL_NEGATIVE,
-      :DOUBLE_NEGATIVE,
-      "{",
-      "OPTIONAL",
-      "MINUS",
-      "SERVICE",
-      "FILTER",
-      "BIND",
-      "VALUES",
-      "^",
-      "!"],
     :ExistsFunc => [
       ".",
       "AS",
@@ -39147,7 +38759,7 @@ module SPARQL::Grammar::Meta
       :INTEGER,
       :DECIMAL,
       :DOUBLE],
-    :ExprEmbTP => [
+    :ExprQuotedTP => [
       "AS",
       ")",
       ",",
@@ -39179,7 +38791,7 @@ module SPARQL::Grammar::Meta
       :INTEGER_NEGATIVE,
       :DECIMAL_NEGATIVE,
       :DOUBLE_NEGATIVE],
-    :_ExprEmbTP_1 => [
+    :_ExprQuotedTP_1 => [
       "AS",
       ")",
       ",",
@@ -39211,7 +38823,7 @@ module SPARQL::Grammar::Meta
       :INTEGER_NEGATIVE,
       :DECIMAL_NEGATIVE,
       :DOUBLE_NEGATIVE],
-    :_ExprEmbTP_2 => [
+    :_ExprQuotedTP_2 => [
       "AS",
       ")",
       ",",
@@ -39243,7 +38855,7 @@ module SPARQL::Grammar::Meta
       :INTEGER_NEGATIVE,
       :DECIMAL_NEGATIVE,
       :DOUBLE_NEGATIVE],
-    :_ExprEmbTP_3 => [
+    :_ExprQuotedTP_3 => [
       "AS",
       ")",
       ",",
@@ -39275,7 +38887,7 @@ module SPARQL::Grammar::Meta
       :INTEGER_NEGATIVE,
       :DECIMAL_NEGATIVE,
       :DOUBLE_NEGATIVE],
-    :_ExprEmbTP_4 => [
+    :_ExprQuotedTP_4 => [
       "AS",
       ")",
       ",",
@@ -42809,10 +42421,10 @@ module SPARQL::Grammar::Meta
       ")",
       "AS",
       ",",
-      "a",
-      ">>",
       "*",
       "/",
+      "a",
+      ">>",
       :IRIREF,
       "UNDEF",
       "{|",
@@ -42872,10 +42484,10 @@ module SPARQL::Grammar::Meta
       ")",
       "AS",
       ",",
-      "a",
-      ">>",
       "*",
       "/",
+      "a",
+      ">>",
       :IRIREF,
       "UNDEF",
       "{|",
@@ -44910,16 +44522,16 @@ module SPARQL::Grammar::Meta
       "{",
       :VAR1,
       :VAR2,
-      "<<",
       :BLANK_NODE_LABEL,
       :ANON,
       :IRIREF,
       "true",
       "false",
-      "a",
-      ">>",
+      "<<",
       "AS",
       ",",
+      "a",
+      ">>",
       "INTO",
       ";",
       :_eof,
@@ -45412,25 +45024,262 @@ module SPARQL::Grammar::Meta
       :INTEGER_NEGATIVE,
       :DECIMAL_NEGATIVE,
       :DOUBLE_NEGATIVE],
-    :Quads => [
+    :Quads => [
+      "}"],
+    :QuadsNotTriples => [
+      ".",
+      "}",
+      "GRAPH",
+      :VAR1,
+      :VAR2,
+      :NIL,
+      "<<",
+      :IRIREF,
+      "true",
+      "false",
+      :BLANK_NODE_LABEL,
+      :ANON,
+      "(",
+      "[",
+      :PNAME_LN,
+      :PNAME_NS,
+      :STRING_LITERAL1,
+      :STRING_LITERAL2,
+      :STRING_LITERAL_LONG1,
+      :STRING_LITERAL_LONG2,
+      :INTEGER,
+      :DECIMAL,
+      :DOUBLE,
+      :INTEGER_POSITIVE,
+      :DECIMAL_POSITIVE,
+      :DOUBLE_POSITIVE,
+      :INTEGER_NEGATIVE,
+      :DECIMAL_NEGATIVE,
+      :DOUBLE_NEGATIVE],
+    :_QuadsNotTriples_1 => [
+      "}"],
+    :_QuadsNotTriples_2 => [
+      ".",
+      "}",
+      "GRAPH",
+      :VAR1,
+      :VAR2,
+      :NIL,
+      "<<",
+      :IRIREF,
+      "true",
+      "false",
+      :BLANK_NODE_LABEL,
+      :ANON,
+      "(",
+      "[",
+      :PNAME_LN,
+      :PNAME_NS,
+      :STRING_LITERAL1,
+      :STRING_LITERAL2,
+      :STRING_LITERAL_LONG1,
+      :STRING_LITERAL_LONG2,
+      :INTEGER,
+      :DECIMAL,
+      :DOUBLE,
+      :INTEGER_POSITIVE,
+      :DECIMAL_POSITIVE,
+      :DOUBLE_POSITIVE,
+      :INTEGER_NEGATIVE,
+      :DECIMAL_NEGATIVE,
+      :DOUBLE_NEGATIVE],
+    :_QuadsNotTriples_3 => [
+      ".",
+      "}",
+      "GRAPH",
+      :VAR1,
+      :VAR2,
+      :NIL,
+      "<<",
+      :IRIREF,
+      "true",
+      "false",
+      :BLANK_NODE_LABEL,
+      :ANON,
+      "(",
+      "[",
+      :PNAME_LN,
+      :PNAME_NS,
+      :STRING_LITERAL1,
+      :STRING_LITERAL2,
+      :STRING_LITERAL_LONG1,
+      :STRING_LITERAL_LONG2,
+      :INTEGER,
+      :DECIMAL,
+      :DOUBLE,
+      :INTEGER_POSITIVE,
+      :DECIMAL_POSITIVE,
+      :DOUBLE_POSITIVE,
+      :INTEGER_NEGATIVE,
+      :DECIMAL_NEGATIVE,
+      :DOUBLE_NEGATIVE],
+    :_QuadsNotTriples_4 => [
+      ".",
+      "}",
+      "GRAPH",
+      :VAR1,
+      :VAR2,
+      :NIL,
+      "<<",
+      :IRIREF,
+      "true",
+      "false",
+      :BLANK_NODE_LABEL,
+      :ANON,
+      "(",
+      "[",
+      :PNAME_LN,
+      :PNAME_NS,
+      :STRING_LITERAL1,
+      :STRING_LITERAL2,
+      :STRING_LITERAL_LONG1,
+      :STRING_LITERAL_LONG2,
+      :INTEGER,
+      :DECIMAL,
+      :DOUBLE,
+      :INTEGER_POSITIVE,
+      :DECIMAL_POSITIVE,
+      :DOUBLE_POSITIVE,
+      :INTEGER_NEGATIVE,
+      :DECIMAL_NEGATIVE,
+      :DOUBLE_NEGATIVE],
+    :_Quads_1 => [
+      "}",
+      "GRAPH"],
+    :_Quads_10 => [
+      "}",
+      "GRAPH"],
+    :_Quads_2 => [
+      "}"],
+    :_Quads_3 => [
+      "}",
+      "GRAPH"],
+    :_Quads_4 => [
+      "}"],
+    :_Quads_5 => [
+      "}",
+      "GRAPH",
+      :VAR1,
+      :VAR2,
+      :NIL,
+      "<<",
+      :IRIREF,
+      "true",
+      "false",
+      :BLANK_NODE_LABEL,
+      :ANON,
+      "(",
+      "[",
+      :PNAME_LN,
+      :PNAME_NS,
+      :STRING_LITERAL1,
+      :STRING_LITERAL2,
+      :STRING_LITERAL_LONG1,
+      :STRING_LITERAL_LONG2,
+      :INTEGER,
+      :DECIMAL,
+      :DOUBLE,
+      :INTEGER_POSITIVE,
+      :DECIMAL_POSITIVE,
+      :DOUBLE_POSITIVE,
+      :INTEGER_NEGATIVE,
+      :DECIMAL_NEGATIVE,
+      :DOUBLE_NEGATIVE],
+    :_Quads_6 => [
+      "}",
+      "GRAPH"],
+    :_Quads_7 => [
       "}"],
-    :QuadsNotTriples => [
-      ".",
+    :_Quads_8 => [
+      "}"],
+    :_Quads_9 => [
       "}",
-      "GRAPH",
+      "GRAPH"],
+    :Query => [
+      :_eof],
+    :QueryUnit => [
+      :_eof],
+    :_Query_1 => [
+      :_eof],
+    :_Query_2 => [
+      :_eof],
+    :QuotedTP => [
+      "a",
+      ">>",
+      "{|",
+      ")",
+      ",",
+      "]",
+      "|}",
       :VAR1,
       :VAR2,
+      :IRIREF,
+      ";",
+      ".",
+      "}",
       :NIL,
       "<<",
-      :IRIREF,
+      "(",
+      "[",
+      :PNAME_LN,
+      :PNAME_NS,
       "true",
       "false",
       :BLANK_NODE_LABEL,
       :ANON,
+      "GRAPH",
+      :STRING_LITERAL1,
+      :STRING_LITERAL2,
+      :STRING_LITERAL_LONG1,
+      :STRING_LITERAL_LONG2,
+      :INTEGER,
+      :DECIMAL,
+      :DOUBLE,
+      :INTEGER_POSITIVE,
+      :DECIMAL_POSITIVE,
+      :DOUBLE_POSITIVE,
+      :INTEGER_NEGATIVE,
+      :DECIMAL_NEGATIVE,
+      :DOUBLE_NEGATIVE,
+      "{",
+      "OPTIONAL",
+      "MINUS",
+      "SERVICE",
+      "FILTER",
+      "BIND",
+      "VALUES",
+      "^",
+      "!"],
+    :_QuotedTP_1 => [
+      "a",
+      ">>",
+      "{|",
+      ")",
+      ",",
+      "]",
+      "|}",
+      :VAR1,
+      :VAR2,
+      :IRIREF,
+      ";",
+      ".",
+      "}",
+      :NIL,
+      "<<",
       "(",
       "[",
       :PNAME_LN,
       :PNAME_NS,
+      "true",
+      "false",
+      :BLANK_NODE_LABEL,
+      :ANON,
+      "GRAPH",
       :STRING_LITERAL1,
       :STRING_LITERAL2,
       :STRING_LITERAL_LONG1,
@@ -45443,26 +45292,88 @@ module SPARQL::Grammar::Meta
       :DOUBLE_POSITIVE,
       :INTEGER_NEGATIVE,
       :DECIMAL_NEGATIVE,
-      :DOUBLE_NEGATIVE],
-    :_QuadsNotTriples_1 => [
-      "}"],
-    :_QuadsNotTriples_2 => [
-      ".",
-      "}",
-      "GRAPH",
+      :DOUBLE_NEGATIVE,
+      "{",
+      "OPTIONAL",
+      "MINUS",
+      "SERVICE",
+      "FILTER",
+      "BIND",
+      "VALUES",
+      "^",
+      "!"],
+    :_QuotedTP_2 => [
+      "a",
+      ">>",
+      "{|",
+      ")",
+      ",",
+      "]",
+      "|}",
       :VAR1,
       :VAR2,
+      :IRIREF,
+      ";",
+      ".",
+      "}",
       :NIL,
       "<<",
-      :IRIREF,
+      "(",
+      "[",
+      :PNAME_LN,
+      :PNAME_NS,
       "true",
       "false",
       :BLANK_NODE_LABEL,
       :ANON,
+      "GRAPH",
+      :STRING_LITERAL1,
+      :STRING_LITERAL2,
+      :STRING_LITERAL_LONG1,
+      :STRING_LITERAL_LONG2,
+      :INTEGER,
+      :DECIMAL,
+      :DOUBLE,
+      :INTEGER_POSITIVE,
+      :DECIMAL_POSITIVE,
+      :DOUBLE_POSITIVE,
+      :INTEGER_NEGATIVE,
+      :DECIMAL_NEGATIVE,
+      :DOUBLE_NEGATIVE,
+      "{",
+      "OPTIONAL",
+      "MINUS",
+      "SERVICE",
+      "FILTER",
+      "BIND",
+      "VALUES",
+      "^",
+      "!"],
+    :_QuotedTP_3 => [
+      "a",
+      ">>",
+      "{|",
+      ")",
+      ",",
+      "]",
+      "|}",
+      :VAR1,
+      :VAR2,
+      :IRIREF,
+      ";",
+      ".",
+      "}",
+      :NIL,
+      "<<",
       "(",
       "[",
       :PNAME_LN,
       :PNAME_NS,
+      "true",
+      "false",
+      :BLANK_NODE_LABEL,
+      :ANON,
+      "GRAPH",
       :STRING_LITERAL1,
       :STRING_LITERAL2,
       :STRING_LITERAL_LONG1,
@@ -45475,24 +45386,75 @@ module SPARQL::Grammar::Meta
       :DOUBLE_POSITIVE,
       :INTEGER_NEGATIVE,
       :DECIMAL_NEGATIVE,
-      :DOUBLE_NEGATIVE],
-    :_QuadsNotTriples_3 => [
-      ".",
-      "}",
-      "GRAPH",
+      :DOUBLE_NEGATIVE,
+      "{",
+      "OPTIONAL",
+      "MINUS",
+      "SERVICE",
+      "FILTER",
+      "BIND",
+      "VALUES",
+      "^",
+      "!"],
+    :_QuotedTP_4 => [
+      "a",
+      ">>",
+      "{|",
+      ")",
+      ",",
+      "]",
+      "|}",
       :VAR1,
       :VAR2,
+      :IRIREF,
+      ";",
+      ".",
+      "}",
       :NIL,
       "<<",
-      :IRIREF,
+      "(",
+      "[",
+      :PNAME_LN,
+      :PNAME_NS,
       "true",
       "false",
       :BLANK_NODE_LABEL,
       :ANON,
-      "(",
-      "[",
+      "GRAPH",
+      :STRING_LITERAL1,
+      :STRING_LITERAL2,
+      :STRING_LITERAL_LONG1,
+      :STRING_LITERAL_LONG2,
+      :INTEGER,
+      :DECIMAL,
+      :DOUBLE,
+      :INTEGER_POSITIVE,
+      :DECIMAL_POSITIVE,
+      :DOUBLE_POSITIVE,
+      :INTEGER_NEGATIVE,
+      :DECIMAL_NEGATIVE,
+      :DOUBLE_NEGATIVE,
+      "{",
+      "OPTIONAL",
+      "MINUS",
+      "SERVICE",
+      "FILTER",
+      "BIND",
+      "VALUES",
+      "^",
+      "!"],
+    :QuotedTriple => [
+      "}",
+      ")",
+      "a",
+      :IRIREF,
+      ">>",
+      "UNDEF",
       :PNAME_LN,
       :PNAME_NS,
+      "<<",
+      "true",
+      "false",
       :STRING_LITERAL1,
       :STRING_LITERAL2,
       :STRING_LITERAL_LONG1,
@@ -45506,21 +45468,11 @@ module SPARQL::Grammar::Meta
       :INTEGER_NEGATIVE,
       :DECIMAL_NEGATIVE,
       :DOUBLE_NEGATIVE],
-    :_QuadsNotTriples_4 => [
-      ".",
-      "}",
-      "GRAPH",
-      :VAR1,
-      :VAR2,
-      :NIL,
-      "<<",
+    :_QuotedTriple_1 => [
       :IRIREF,
       "true",
       "false",
-      :BLANK_NODE_LABEL,
-      :ANON,
-      "(",
-      "[",
+      "<<",
       :PNAME_LN,
       :PNAME_NS,
       :STRING_LITERAL1,
@@ -45536,35 +45488,43 @@ module SPARQL::Grammar::Meta
       :INTEGER_NEGATIVE,
       :DECIMAL_NEGATIVE,
       :DOUBLE_NEGATIVE],
-    :_Quads_1 => [
+    :_QuotedTriple_2 => [
       "}",
-      "GRAPH"],
-    :_Quads_10 => [
-      "}",
-      "GRAPH"],
-    :_Quads_2 => [
-      "}"],
-    :_Quads_3 => [
-      "}",
-      "GRAPH"],
-    :_Quads_4 => [
-      "}"],
-    :_Quads_5 => [
-      "}",
-      "GRAPH",
-      :VAR1,
-      :VAR2,
-      :NIL,
-      "<<",
+      ")",
+      "a",
       :IRIREF,
+      ">>",
+      "UNDEF",
+      :PNAME_LN,
+      :PNAME_NS,
+      "<<",
       "true",
       "false",
-      :BLANK_NODE_LABEL,
-      :ANON,
-      "(",
-      "[",
+      :STRING_LITERAL1,
+      :STRING_LITERAL2,
+      :STRING_LITERAL_LONG1,
+      :STRING_LITERAL_LONG2,
+      :INTEGER,
+      :DECIMAL,
+      :DOUBLE,
+      :INTEGER_POSITIVE,
+      :DECIMAL_POSITIVE,
+      :DOUBLE_POSITIVE,
+      :INTEGER_NEGATIVE,
+      :DECIMAL_NEGATIVE,
+      :DOUBLE_NEGATIVE],
+    :_QuotedTriple_3 => [
+      "}",
+      ")",
+      "a",
+      :IRIREF,
+      ">>",
+      "UNDEF",
       :PNAME_LN,
       :PNAME_NS,
+      "<<",
+      "true",
+      "false",
       :STRING_LITERAL1,
       :STRING_LITERAL2,
       :STRING_LITERAL_LONG1,
@@ -45578,24 +45538,56 @@ module SPARQL::Grammar::Meta
       :INTEGER_NEGATIVE,
       :DECIMAL_NEGATIVE,
       :DOUBLE_NEGATIVE],
-    :_Quads_6 => [
+    :_QuotedTriple_4 => [
       "}",
-      "GRAPH"],
-    :_Quads_7 => [
-      "}"],
-    :_Quads_8 => [
-      "}"],
-    :_Quads_9 => [
+      ")",
+      "a",
+      :IRIREF,
+      ">>",
+      "UNDEF",
+      :PNAME_LN,
+      :PNAME_NS,
+      "<<",
+      "true",
+      "false",
+      :STRING_LITERAL1,
+      :STRING_LITERAL2,
+      :STRING_LITERAL_LONG1,
+      :STRING_LITERAL_LONG2,
+      :INTEGER,
+      :DECIMAL,
+      :DOUBLE,
+      :INTEGER_POSITIVE,
+      :DECIMAL_POSITIVE,
+      :DOUBLE_POSITIVE,
+      :INTEGER_NEGATIVE,
+      :DECIMAL_NEGATIVE,
+      :DOUBLE_NEGATIVE],
+    :_QuotedTriple_5 => [
       "}",
-      "GRAPH"],
-    :Query => [
-      :_eof],
-    :QueryUnit => [
-      :_eof],
-    :_Query_1 => [
-      :_eof],
-    :_Query_2 => [
-      :_eof],
+      ")",
+      "a",
+      :IRIREF,
+      ">>",
+      "UNDEF",
+      :PNAME_LN,
+      :PNAME_NS,
+      "<<",
+      "true",
+      "false",
+      :STRING_LITERAL1,
+      :STRING_LITERAL2,
+      :STRING_LITERAL_LONG1,
+      :STRING_LITERAL_LONG2,
+      :INTEGER,
+      :DECIMAL,
+      :DOUBLE,
+      :INTEGER_POSITIVE,
+      :DECIMAL_POSITIVE,
+      :DOUBLE_POSITIVE,
+      :INTEGER_NEGATIVE,
+      :DECIMAL_NEGATIVE,
+      :DOUBLE_NEGATIVE],
     :RDFLiteral => [
       "}",
       ")",
@@ -47133,10 +47125,10 @@ module SPARQL::Grammar::Meta
       ")",
       "AS",
       ",",
-      "a",
-      ">>",
       "FROM",
       "USING",
+      "a",
+      ">>",
       :IRIREF,
       "UNDEF",
       "{|",
@@ -47164,9 +47156,9 @@ module SPARQL::Grammar::Meta
       "/",
       "+",
       "-",
+      "ORDER",
       :VAR1,
       :VAR2,
-      "ORDER",
       :STRING_LITERAL1,
       :STRING_LITERAL2,
       :STRING_LITERAL_LONG1,
@@ -48233,9 +48225,9 @@ module SPARQL::Grammar::Meta
       ")",
       "AS",
       ",",
+      "^^",
       "a",
       ">>",
-      "^^",
       :IRIREF,
       "UNDEF",
       "{|",
@@ -49544,12 +49536,12 @@ module SPARQL::Grammar::Meta
       ")",
       :VAR1,
       :VAR2,
-      "<<",
       :BLANK_NODE_LABEL,
       :ANON,
       :IRIREF,
       "true",
       "false",
+      "<<",
       "AS",
       ",",
       "a",
@@ -49681,12 +49673,12 @@ module SPARQL::Grammar::Meta
       "{",
       :VAR1,
       :VAR2,
-      "<<",
       :BLANK_NODE_LABEL,
       :ANON,
       :IRIREF,
       "true",
       "false",
+      "<<",
       :PNAME_LN,
       :PNAME_NS,
       :STRING_LITERAL1,
@@ -49714,7 +49706,7 @@ module SPARQL::Grammar::Meta
       :_eof,
       "LIMIT",
       "OFFSET"],
-    :VarOrTermOrEmbTP => [
+    :VarOrTermOrQuotedTP => [
       "a",
       "{|",
       ")",
@@ -49763,12 +49755,12 @@ module SPARQL::Grammar::Meta
     :Verb => [
       :VAR1,
       :VAR2,
-      "<<",
       :BLANK_NODE_LABEL,
       :ANON,
       :IRIREF,
       "true",
       "false",
+      "<<",
       :PNAME_LN,
       :PNAME_NS,
       :STRING_LITERAL1,
@@ -49908,16 +49900,16 @@ module SPARQL::Grammar::Meta
       "{",
       :VAR1,
       :VAR2,
-      "<<",
       :BLANK_NODE_LABEL,
       :ANON,
       :IRIREF,
       "true",
       "false",
-      "a",
-      ">>",
+      "<<",
       "AS",
       ",",
+      "a",
+      ">>",
       "INTO",
       ";",
       :_eof,
@@ -50050,6 +50042,14 @@ module SPARQL::Grammar::Meta
       :INTEGER_NEGATIVE,
       :DECIMAL_NEGATIVE,
       :DOUBLE_NEGATIVE],
+    :qtSubjectOrObject => [
+      "a",
+      ">>",
+      :VAR1,
+      :VAR2,
+      :IRIREF,
+      :PNAME_LN,
+      :PNAME_NS],
   }.freeze
   CLEANUP = {
     :_Add_1 => :opt,