Skip to content

Commit

Permalink
Add support for embedded triples in VALUES.
Browse files Browse the repository at this point in the history
  • Loading branch information
@gkellogg
gkellogg committed Feb 28, 2021
1 parent f499842 commit 1cf682b
Show file tree
Hide file tree
Showing 10 changed files with 473 additions and 115 deletions.
6 changes: 4 additions & 2 deletions etc/sparql11.bnf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
[63] InlineDataOneVar ::= Var '{' DataBlockValue* '}'
[64] InlineDataFull ::= ( NIL | '(' Var* ')' )
'{' ( '(' DataBlockValue* ')' | NIL )* '}'
[65] DataBlockValue ::= iri | RDFLiteral | NumericLiteral | BooleanLiteral | 'UNDEF'
[65] DataBlockValue ::= EmbTD | iri | RDFLiteral | NumericLiteral | BooleanLiteral | 'UNDEF'
[66] MinusGraphPattern ::= 'MINUS' GroupGraphPattern
[67] GroupOrUnionGraphPattern::= GroupGraphPattern ( 'UNION' GroupGraphPattern )*
[68] Filter ::= 'FILTER' Constraint
Expand Down Expand Up @@ -127,7 +127,7 @@
[106] VarOrTerm ::= Var | GraphTerm
[107] VarOrIri ::= Var | iri
[108] Var ::= VAR1 | VAR2
[109] GraphTerm ::= iri | RDFLiteral | NumericLiteral | BooleanLiteral
[109] GraphTerm ::= iri | RDFLiteral | NumericLiteral | BooleanLiteral
| BlankNode | NIL
[110] Expression ::= ConditionalOrExpression
[111] ConditionalOrExpression ::= ConditionalAndExpression
Expand Down Expand Up @@ -245,6 +245,8 @@
[176] VarOrTermOrEmbTP ::= Var | GraphTerm | EmbTP
[177] AnnotationPattern ::= '{|' PropertyListNotEmpty '|}'
[178] AnnotationPatternPath ::= '{|' PropertyListPathNotEmpty '|}'
[179] EmbTD ::= '<<' DataValueTerm ( iri | 'a' ) DataValueTerm '>>'
[180] DataValueTerm ::= EmbTD | iri | RDFLiteral | NumericLiteral | BooleanLiteral

@terminals

Expand Down
14 changes: 13 additions & 1 deletion etc/sparql11.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@
<td>[65]</td>
<td><code>DataBlockValue</code></td>
<td>::=</td>
<td><a href="#grammar-production-iri">iri</a> <code>|</code> <a href="#grammar-production-RDFLiteral">RDFLiteral</a> <code>|</code> <a href="#grammar-production-NumericLiteral">NumericLiteral</a> <code>|</code> <a href="#grammar-production-BooleanLiteral">BooleanLiteral</a> <code>|</code> &quot;UNDEF&quot;</td>
<td><a href="#grammar-production-EmbTD">EmbTD</a> <code>|</code> <a href="#grammar-production-iri">iri</a> <code>|</code> <a href="#grammar-production-RDFLiteral">RDFLiteral</a> <code>|</code> <a href="#grammar-production-NumericLiteral">NumericLiteral</a> <code>|</code> <a href="#grammar-production-BooleanLiteral">BooleanLiteral</a> <code>|</code> &quot;UNDEF&quot;</td>
</tr>
<tr id="grammar-production-MinusGraphPattern">
<td>[66]</td>
Expand Down Expand Up @@ -1184,6 +1184,18 @@
<td>::=</td>
<td>&quot;{|&quot; <a href="#grammar-production-PropertyListPathNotEmpty">PropertyListPathNotEmpty</a> &quot;|}&quot;</td>
</tr>
<tr id="grammar-production-EmbTD">
<td>[179]</td>
<td><code>EmbTD</code></td>
<td>::=</td>
<td>&quot;&lt;&lt;&quot; <a href="#grammar-production-DataValueTerm">DataValueTerm</a> <code>(</code> <a href="#grammar-production-iri">iri</a> <code>|</code> "<code class="grammar-literal">a</code>"<code>)</code> <a href="#grammar-production-DataValueTerm">DataValueTerm</a> &quot;&gt;&gt;&quot;</td>
</tr>
<tr id="grammar-production-DataValueTerm">
<td>[180]</td>
<td><code>DataValueTerm</code></td>
<td>::=</td>
<td><a href="#grammar-production-EmbTD">EmbTD</a> <code>|</code> <a href="#grammar-production-iri">iri</a> <code>|</code> <a href="#grammar-production-RDFLiteral">RDFLiteral</a> <code>|</code> <a href="#grammar-production-NumericLiteral">NumericLiteral</a> <code>|</code> <a href="#grammar-production-BooleanLiteral">BooleanLiteral</a></td>
</tr>
<tr id="grammar-production-">
<td colspan=2>@terminals</td>
<td></td>
Expand Down
147 changes: 98 additions & 49 deletions etc/sparql11.ll1.sxp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1013,15 +1013,15 @@
"false" "true" "{" "}" )
(seq Var "{" _InlineDataOneVar_1 "}"))
(rule _InlineDataOneVar_1 "63.1"
(first DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE
(first "<<" DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE
DOUBLE_POSITIVE INTEGER INTEGER_NEGATIVE INTEGER_POSITIVE IRIREF PNAME_LN
PNAME_NS STRING_LITERAL1 STRING_LITERAL2 STRING_LITERAL_LONG1
STRING_LITERAL_LONG2 "UNDEF" _eps "false" "true" )
(follow "}")
(cleanup star)
(alt _empty _InlineDataOneVar_2))
(rule _InlineDataOneVar_2 "63.2"
(first DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE
(first "<<" DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE
DOUBLE_POSITIVE INTEGER INTEGER_NEGATIVE INTEGER_POSITIVE IRIREF PNAME_LN
PNAME_NS STRING_LITERAL1 STRING_LITERAL2 STRING_LITERAL_LONG1
STRING_LITERAL_LONG2 "UNDEF" "false" "true" )
Expand Down Expand Up @@ -1068,31 +1068,31 @@
(follow "(" NIL "}")
(seq "(" _InlineDataFull_9 ")"))
(rule _InlineDataFull_9 "64.9"
(first DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE
(first "<<" DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE
DOUBLE_POSITIVE INTEGER INTEGER_NEGATIVE INTEGER_POSITIVE IRIREF PNAME_LN
PNAME_NS STRING_LITERAL1 STRING_LITERAL2 STRING_LITERAL_LONG1
STRING_LITERAL_LONG2 "UNDEF" _eps "false" "true" )
(follow ")")
(cleanup star)
(alt _empty _InlineDataFull_10))
(rule _InlineDataFull_10 "64.10"
(first DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE
(first "<<" DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE
DOUBLE_POSITIVE INTEGER INTEGER_NEGATIVE INTEGER_POSITIVE IRIREF PNAME_LN
PNAME_NS STRING_LITERAL1 STRING_LITERAL2 STRING_LITERAL_LONG1
STRING_LITERAL_LONG2 "UNDEF" "false" "true" )
(follow ")")
(cleanup merge)
(seq DataBlockValue _InlineDataFull_9))
(rule DataBlockValue "65"
(first DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE
(first "<<" DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE
DOUBLE_POSITIVE INTEGER INTEGER_NEGATIVE INTEGER_POSITIVE IRIREF PNAME_LN
PNAME_NS STRING_LITERAL1 STRING_LITERAL2 STRING_LITERAL_LONG1
STRING_LITERAL_LONG2 "UNDEF" "false" "true" )
(follow ")" DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE
DOUBLE_POSITIVE INTEGER INTEGER_NEGATIVE INTEGER_POSITIVE IRIREF PNAME_LN
PNAME_NS STRING_LITERAL1 STRING_LITERAL2 STRING_LITERAL_LONG1
STRING_LITERAL_LONG2 "UNDEF" "false" "true" "}" )
(alt iri RDFLiteral NumericLiteral BooleanLiteral "UNDEF"))
(follow ")" "<<" DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE
DOUBLE_NEGATIVE DOUBLE_POSITIVE INTEGER INTEGER_NEGATIVE INTEGER_POSITIVE
IRIREF PNAME_LN PNAME_NS STRING_LITERAL1 STRING_LITERAL2
STRING_LITERAL_LONG1 STRING_LITERAL_LONG2 "UNDEF" "false" "true" "}" )
(alt EmbTD iri RDFLiteral NumericLiteral BooleanLiteral "UNDEF"))
(rule MinusGraphPattern "66"
(first "MINUS")
(follow "(" "." "<<" ANON "BIND" BLANK_NODE_LABEL DECIMAL DECIMAL_NEGATIVE
Expand Down Expand Up @@ -1404,45 +1404,39 @@
VAR1 VAR2 "[" "false" "true" )
(follow "." ";" "BIND" "FILTER" "GRAPH" "MINUS" "OPTIONAL" "SERVICE" "VALUES"
"]" "{" "|}" "}" )
(seq Object _ObjectList_1 _ObjectList_2))
(seq Object _ObjectList_1))
(rule _ObjectList_1 "79.1"
(first _eps "{|")
(follow "," "." ";" "BIND" "FILTER" "GRAPH" "MINUS" "OPTIONAL" "SERVICE"
"VALUES" "]" "{" "|}" "}" )
(cleanup opt)
(alt _empty AnnotationPattern))
(rule _ObjectList_2 "79.2"
(first "," _eps)
(follow "." ";" "BIND" "FILTER" "GRAPH" "MINUS" "OPTIONAL" "SERVICE" "VALUES"
"]" "{" "|}" "}" )
(cleanup star)
(alt _empty _ObjectList_4))
(rule _ObjectList_4 "79.4"
(alt _empty _ObjectList_3))
(rule _ObjectList_3 "79.3"
(first ",")
(follow "." ";" "BIND" "FILTER" "GRAPH" "MINUS" "OPTIONAL" "SERVICE" "VALUES"
"]" "{" "|}" "}" )
(cleanup merge)
(seq _ObjectList_3 _ObjectList_2))
(rule _ObjectList_3 "79.3"
(seq _ObjectList_2 _ObjectList_1))
(rule _ObjectList_2 "79.2"
(first ",")
(follow "," "." ";" "BIND" "FILTER" "GRAPH" "MINUS" "OPTIONAL" "SERVICE"
"VALUES" "]" "{" "|}" "}" )
(seq "," Object _ObjectList_5))
(rule _ObjectList_5 "79.5"
(first _eps "{|")
(follow "," "." ";" "BIND" "FILTER" "GRAPH" "MINUS" "OPTIONAL" "SERVICE"
"VALUES" "]" "{" "|}" "}" )
(cleanup opt)
(alt _empty AnnotationPattern))
(seq "," Object))
(rule Object "80"
(first "(" "<<" ANON BLANK_NODE_LABEL DECIMAL DECIMAL_NEGATIVE
DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE DOUBLE_POSITIVE INTEGER
INTEGER_NEGATIVE INTEGER_POSITIVE IRIREF NIL PNAME_LN PNAME_NS
STRING_LITERAL1 STRING_LITERAL2 STRING_LITERAL_LONG1 STRING_LITERAL_LONG2
VAR1 VAR2 "[" "false" "true" )
(follow "," "." ";" "BIND" "FILTER" "GRAPH" "MINUS" "OPTIONAL" "SERVICE"
"VALUES" "]" "{" "{|" "|}" "}" )
(seq GraphNode))
"VALUES" "]" "{" "|}" "}" )
(seq GraphNode _Object_1))
(rule _Object_1 "80.1"
(first _eps "{|")
(follow "," "." ";" "BIND" "FILTER" "GRAPH" "MINUS" "OPTIONAL" "SERVICE"
"VALUES" "]" "{" "|}" "}" )
(cleanup opt)
(alt _empty AnnotationPattern))
(rule TriplesSameSubjectPath "81"
(first "(" "<<" ANON BLANK_NODE_LABEL DECIMAL DECIMAL_NEGATIVE
DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE DOUBLE_POSITIVE INTEGER
Expand Down Expand Up @@ -3875,6 +3869,27 @@
(follow "," "." ";" "BIND" "FILTER" "GRAPH" "MINUS" "OPTIONAL" "SERVICE"
"VALUES" "]" "{" "|}" "}" )
(seq "{|" PropertyListPathNotEmpty "|}"))
(rule EmbTD "179"
(first "<<")
(follow ")" "<<" ">>" DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE
DOUBLE_NEGATIVE DOUBLE_POSITIVE INTEGER INTEGER_NEGATIVE INTEGER_POSITIVE
IRIREF PNAME_LN PNAME_NS STRING_LITERAL1 STRING_LITERAL2
STRING_LITERAL_LONG1 STRING_LITERAL_LONG2 "UNDEF" "a" "false" "true" "}" )
(seq "<<" DataValueTerm _EmbTD_1 DataValueTerm ">>"))
(rule _EmbTD_1 "179.1"
(first IRIREF PNAME_LN PNAME_NS "a")
(follow "<<" DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE
DOUBLE_POSITIVE INTEGER INTEGER_NEGATIVE INTEGER_POSITIVE IRIREF PNAME_LN
PNAME_NS STRING_LITERAL1 STRING_LITERAL2 STRING_LITERAL_LONG1
STRING_LITERAL_LONG2 "false" "true" )
(alt iri "a"))
(rule DataValueTerm "180"
(first "<<" DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE
DOUBLE_POSITIVE INTEGER INTEGER_NEGATIVE INTEGER_POSITIVE IRIREF PNAME_LN
PNAME_NS STRING_LITERAL1 STRING_LITERAL2 STRING_LITERAL_LONG1
STRING_LITERAL_LONG2 "false" "true" )
(follow ">>" IRIREF PNAME_LN PNAME_NS "a")
(alt EmbTD iri RDFLiteral NumericLiteral BooleanLiteral))
(terminals _terminals (seq))
(terminal IRIREF "139" (seq "<" (star (alt (range "^#x00-#x20<>\"{}|^`\\") UCHAR)) ">"))
(terminal PNAME_NS "140" (seq (opt PN_PREFIX) ":"))
Expand Down Expand Up @@ -4416,7 +4431,7 @@
"false" "true" "{" "}" )
(seq "{" _InlineDataOneVar_1 "}"))
(rule _InlineDataOneVar_4 "63.4"
(first DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE
(first "<<" DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE
DOUBLE_POSITIVE INTEGER INTEGER_NEGATIVE INTEGER_POSITIVE IRIREF PNAME_LN
PNAME_NS STRING_LITERAL1 STRING_LITERAL2 STRING_LITERAL_LONG1
STRING_LITERAL_LONG2 "UNDEF" _eps "false" "true" )
Expand Down Expand Up @@ -4444,14 +4459,14 @@
(follow "}")
(seq _InlineDataFull_2))
(rule _InlineDataFull_15 "64.15"
(first ")" DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE
DOUBLE_POSITIVE INTEGER INTEGER_NEGATIVE INTEGER_POSITIVE IRIREF PNAME_LN
PNAME_NS STRING_LITERAL1 STRING_LITERAL2 STRING_LITERAL_LONG1
STRING_LITERAL_LONG2 "UNDEF" "false" "true" )
(first ")" "<<" DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE
DOUBLE_NEGATIVE DOUBLE_POSITIVE INTEGER INTEGER_NEGATIVE INTEGER_POSITIVE
IRIREF PNAME_LN PNAME_NS STRING_LITERAL1 STRING_LITERAL2
STRING_LITERAL_LONG1 STRING_LITERAL_LONG2 "UNDEF" "false" "true" )
(follow "(" NIL "}")
(seq _InlineDataFull_9 ")"))
(rule _InlineDataFull_16 "64.16"
(first DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE
(first "<<" DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE
DOUBLE_POSITIVE INTEGER INTEGER_NEGATIVE INTEGER_POSITIVE IRIREF PNAME_LN
PNAME_NS STRING_LITERAL1 STRING_LITERAL2 STRING_LITERAL_LONG1
STRING_LITERAL_LONG2 "UNDEF" _eps "false" "true" )
Expand Down Expand Up @@ -4652,25 +4667,30 @@
VAR1 VAR2 "[" "false" "true" )
(follow "." ";" "GRAPH" "]" "|}" "}")
(seq ObjectList))
(rule _ObjectList_6 "79.6"
(first "," _eps "{|")
(rule _ObjectList_4 "79.4"
(first "," _eps)
(follow "." ";" "BIND" "FILTER" "GRAPH" "MINUS" "OPTIONAL" "SERVICE" "VALUES"
"]" "{" "|}" "}" )
(seq _ObjectList_1 _ObjectList_2))
(rule _ObjectList_7 "79.7"
(seq _ObjectList_1))
(rule _ObjectList_5 "79.5"
(first "," _eps)
(follow "." ";" "BIND" "FILTER" "GRAPH" "MINUS" "OPTIONAL" "SERVICE" "VALUES"
"]" "{" "|}" "}" )
(seq _ObjectList_2))
(rule _ObjectList_8 "79.8"
(seq _ObjectList_1))
(rule _ObjectList_6 "79.6"
(first "(" "<<" ANON BLANK_NODE_LABEL DECIMAL DECIMAL_NEGATIVE
DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE DOUBLE_POSITIVE INTEGER
INTEGER_NEGATIVE INTEGER_POSITIVE IRIREF NIL PNAME_LN PNAME_NS
STRING_LITERAL1 STRING_LITERAL2 STRING_LITERAL_LONG1 STRING_LITERAL_LONG2
VAR1 VAR2 "[" "false" "true" )
(follow "," "." ";" "BIND" "FILTER" "GRAPH" "MINUS" "OPTIONAL" "SERVICE"
"VALUES" "]" "{" "|}" "}" )
(seq Object _ObjectList_5))
(seq Object))
(rule _Object_2 "80.2"
(first _eps "{|")
(follow "," "." ";" "BIND" "FILTER" "GRAPH" "MINUS" "OPTIONAL" "SERVICE"
"VALUES" "]" "{" "|}" "}" )
(seq _Object_1))
(rule _TriplesSameSubjectPath_3 "81.3"
(first "!" "(" IRIREF PNAME_LN PNAME_NS VAR1 VAR2 "^" "a")
(follow "." "BIND" "FILTER" "GRAPH" "MINUS" "OPTIONAL" "SERVICE" "VALUES" "{" "}")
Expand Down Expand Up @@ -5907,6 +5927,16 @@
(follow "," "." ";" "BIND" "FILTER" "GRAPH" "MINUS" "OPTIONAL" "SERVICE"
"VALUES" "]" "{" "|}" "}" )
(seq PropertyListPathNotEmpty "|}"))
(rule _EmbTD_2 "179.2"
(first "<<" DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE
DOUBLE_POSITIVE INTEGER INTEGER_NEGATIVE INTEGER_POSITIVE IRIREF PNAME_LN
PNAME_NS STRING_LITERAL1 STRING_LITERAL2 STRING_LITERAL_LONG1
STRING_LITERAL_LONG2 "false" "true" )
(follow ")" "<<" ">>" DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE
DOUBLE_NEGATIVE DOUBLE_POSITIVE INTEGER INTEGER_NEGATIVE INTEGER_POSITIVE
IRIREF PNAME_LN PNAME_NS STRING_LITERAL1 STRING_LITERAL2
STRING_LITERAL_LONG1 STRING_LITERAL_LONG2 "UNDEF" "a" "false" "true" "}" )
(seq DataValueTerm _EmbTD_1 DataValueTerm ">>"))
(rule _SubSelect_2 "8.2"
(first "GROUP" "HAVING" "LIMIT" "OFFSET" "ORDER" "VALUES" _eps)
(follow _eof "}")
Expand Down Expand Up @@ -6084,7 +6114,7 @@
"true" "{" "}" )
(seq _Bind_1 "AS" Var ")"))
(rule _InlineDataOneVar_5 "63.5"
(first DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE
(first "<<" DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE
DOUBLE_POSITIVE INTEGER INTEGER_NEGATIVE INTEGER_POSITIVE IRIREF PNAME_LN
PNAME_NS STRING_LITERAL1 STRING_LITERAL2 STRING_LITERAL_LONG1
STRING_LITERAL_LONG2 "UNDEF" "false" "true" "}" )
Expand Down Expand Up @@ -6171,11 +6201,6 @@
"isURI" "sameTerm" "true" "{" "||" "}" )
(seq _ExpressionList_2 ")"))
(rule _ConstructTemplate_3 "73.3" (first "}") (follow "FROM" "WHERE" "{") (seq "}"))
(rule _ObjectList_9 "79.9"
(first _eps "{|")
(follow "," "." ";" "BIND" "FILTER" "GRAPH" "MINUS" "OPTIONAL" "SERVICE"
"VALUES" "]" "{" "|}" "}" )
(seq _ObjectList_5))
(rule _PathPrimary_5 "94.5"
(first ")")
(follow "(" ")" "*" "+" "/" "<<" "?" ANON BLANK_NODE_LABEL DECIMAL
Expand Down Expand Up @@ -6882,6 +6907,13 @@
(follow "," "." ";" "BIND" "FILTER" "GRAPH" "MINUS" "OPTIONAL" "SERVICE"
"VALUES" "]" "{" "|}" "}" )
(seq "|}"))
(rule _EmbTD_3 "179.3"
(first IRIREF PNAME_LN PNAME_NS "a")
(follow ")" "<<" ">>" DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE
DOUBLE_NEGATIVE DOUBLE_POSITIVE INTEGER INTEGER_NEGATIVE INTEGER_POSITIVE
IRIREF PNAME_LN PNAME_NS STRING_LITERAL1 STRING_LITERAL2
STRING_LITERAL_LONG1 STRING_LITERAL_LONG2 "UNDEF" "a" "false" "true" "}" )
(seq _EmbTD_1 DataValueTerm ">>"))
(rule _ConstructQuery_17 "10.17"
(first "GROUP" "HAVING" "LIMIT" "OFFSET" "ORDER" _eps)
(follow "VALUES" _eof)
Expand Down Expand Up @@ -7248,6 +7280,16 @@
STRING_LITERAL2 STRING_LITERAL_LONG1 STRING_LITERAL_LONG2 "VALUES" VAR1 VAR2
"[" "]" "^" "a" "false" "true" "{" "{|" "|}" "}" )
(seq EmbSubjectOrObject ">>"))
(rule _EmbTD_4 "179.4"
(first "<<" DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE DOUBLE_NEGATIVE
DOUBLE_POSITIVE INTEGER INTEGER_NEGATIVE INTEGER_POSITIVE IRIREF PNAME_LN
PNAME_NS STRING_LITERAL1 STRING_LITERAL2 STRING_LITERAL_LONG1
STRING_LITERAL_LONG2 "false" "true" )
(follow ")" "<<" ">>" DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE
DOUBLE_NEGATIVE DOUBLE_POSITIVE INTEGER INTEGER_NEGATIVE INTEGER_POSITIVE
IRIREF PNAME_LN PNAME_NS STRING_LITERAL1 STRING_LITERAL2
STRING_LITERAL_LONG1 STRING_LITERAL_LONG2 "UNDEF" "a" "false" "true" "}" )
(seq DataValueTerm ">>"))
(rule _ConstructQuery_19 "10.19"
(first "}")
(follow "VALUES" _eof)
Expand Down Expand Up @@ -7378,6 +7420,13 @@
STRING_LITERAL2 STRING_LITERAL_LONG1 STRING_LITERAL_LONG2 "VALUES" VAR1 VAR2
"[" "]" "^" "a" "false" "true" "{" "{|" "|}" "}" )
(seq ">>"))
(rule _EmbTD_5 "179.5"
(first ">>")
(follow ")" "<<" ">>" DECIMAL DECIMAL_NEGATIVE DECIMAL_POSITIVE DOUBLE
DOUBLE_NEGATIVE DOUBLE_POSITIVE INTEGER INTEGER_NEGATIVE INTEGER_POSITIVE
IRIREF PNAME_LN PNAME_NS STRING_LITERAL1 STRING_LITERAL2
STRING_LITERAL_LONG1 STRING_LITERAL_LONG2 "UNDEF" "a" "false" "true" "}" )
(seq ">>"))
(rule _RegexExpression_8 "122.8"
(first ")" ",")
(follow "!=" "&&" "(" ")" "*" "+" "," "-" "." "/" ";" "<" "<<" "<=" "=" ">"
Expand Down
18 changes: 10 additions & 8 deletions etc/sparql11.sxp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@
(cleanup merge)
(seq DataBlockValue _InlineDataFull_9))
(rule DataBlockValue "65"
(alt iri RDFLiteral NumericLiteral BooleanLiteral "UNDEF"))
(alt EmbTD iri RDFLiteral NumericLiteral BooleanLiteral "UNDEF"))
(rule MinusGraphPattern "66" (seq "MINUS" GroupGraphPattern))
(rule GroupOrUnionGraphPattern "67"
(seq GroupGraphPattern _GroupOrUnionGraphPattern_1))
Expand Down Expand Up @@ -253,13 +253,12 @@
(alt _empty _PropertyListNotEmpty_5))
(rule _PropertyListNotEmpty_5 "77.5" (seq Verb ObjectList))
(rule Verb "78" (alt VarOrIri "a"))
(rule ObjectList "79" (seq Object _ObjectList_1 _ObjectList_2))
(rule _ObjectList_1 "79.1" (cleanup opt) (alt _empty AnnotationPattern))
(rule _ObjectList_2 "79.2" (cleanup star) (alt _empty _ObjectList_4))
(rule _ObjectList_4 "79.4" (cleanup merge) (seq _ObjectList_3 _ObjectList_2))
(rule _ObjectList_3 "79.3" (seq "," Object _ObjectList_5))
(rule _ObjectList_5 "79.5" (cleanup opt) (alt _empty AnnotationPattern))
(rule Object "80" (seq GraphNode))
(rule ObjectList "79" (seq Object _ObjectList_1))
(rule _ObjectList_1 "79.1" (cleanup star) (alt _empty _ObjectList_3))
(rule _ObjectList_3 "79.3" (cleanup merge) (seq _ObjectList_2 _ObjectList_1))
(rule _ObjectList_2 "79.2" (seq "," Object))
(rule Object "80" (seq GraphNode _Object_1))
(rule _Object_1 "80.1" (cleanup opt) (alt _empty AnnotationPattern))
(rule TriplesSameSubjectPath "81"
(alt _TriplesSameSubjectPath_1 _TriplesSameSubjectPath_2))
(rule _TriplesSameSubjectPath_1 "81.1"
Expand Down Expand Up @@ -557,6 +556,9 @@
(rule VarOrTermOrEmbTP "176" (alt Var GraphTerm EmbTP))
(rule AnnotationPattern "177" (seq "{|" PropertyListNotEmpty "|}"))
(rule AnnotationPatternPath "178" (seq "{|" PropertyListPathNotEmpty "|}"))
(rule EmbTD "179" (seq "<<" DataValueTerm _EmbTD_1 DataValueTerm ">>"))
(rule _EmbTD_1 "179.1" (alt iri "a"))
(rule DataValueTerm "180" (alt EmbTD iri RDFLiteral NumericLiteral BooleanLiteral))
(terminals _terminals (seq))
(terminal IRIREF "139" (seq "<" (star (alt (range "^#x00-#x20<>\"{}|^`\\") UCHAR)) ">"))
(terminal PNAME_NS "140" (seq (opt PN_PREFIX) ":"))
Expand Down

0 comments on commit 1cf682b

Please sign in to comment.