Skip to content

Commit 9097c6e

Browse files
gkellogggkellogg
committed
Update grammar files.
1 parent 8b23456 commit 9097c6e

File tree

3 files changed

+19
-13
lines changed

3 files changed

+19
-13
lines changed

‎etc/sparql12.peg.sxp‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -281,19 +281,21 @@
281281
(seq '<<' ReifiedTripleSubject Verb ReifiedTripleObject _ReifiedTriple_1 '>>'))
282282
(rule _ReifiedTriple_1 (opt Reifier))
283283
(rule ReifiedTripleSubject
284-
(alt Var iri RDFLiteral NumericLiteral BooleanLiteral BlankNode ReifiedTriple))
284+
(alt Var iri RDFLiteral NumericLiteral BooleanLiteral BlankNode ReifiedTriple
285+
TripleTerm ))
285286
(rule ReifiedTripleObject
286287
(alt Var iri RDFLiteral NumericLiteral BooleanLiteral BlankNode ReifiedTriple
287288
TripleTerm ))
288289
(rule TripleTerm (seq '<<(' TripleTermSubject Verb TripleTermObject ')>>'))
289290
(rule TripleTermSubject
290-
(alt Var iri RDFLiteral NumericLiteral BooleanLiteral BlankNode))
291+
(alt Var iri RDFLiteral NumericLiteral BooleanLiteral BlankNode TripleTerm))
291292
(rule TripleTermObject
292293
(alt Var iri RDFLiteral NumericLiteral BooleanLiteral BlankNode TripleTerm))
293294
(rule TripleTermData
294295
(seq '<<(' TripleTermDataSubject _TripleTermData_1 TripleTermDataObject ')>>'))
295296
(rule _TripleTermData_1 (alt iri 'a'))
296-
(rule TripleTermDataSubject (alt iri RDFLiteral NumericLiteral BooleanLiteral))
297+
(rule TripleTermDataSubject
298+
(alt iri RDFLiteral NumericLiteral BooleanLiteral TripleTermData))
297299
(rule TripleTermDataObject
298300
(alt iri RDFLiteral NumericLiteral BooleanLiteral TripleTermData))
299301
(rule VarOrIri (alt Var iri))
@@ -350,7 +352,8 @@
350352
BooleanLiteral Var ExprTripleTerm ))
351353
(rule ExprTripleTerm
352354
(seq '<<(' ExprTripleTermSubject Verb ExprTripleTermObject ')>>'))
353-
(rule ExprTripleTermSubject (alt iri RDFLiteral NumericLiteral BooleanLiteral Var))
355+
(rule ExprTripleTermSubject
356+
(alt iri RDFLiteral NumericLiteral BooleanLiteral Var ExprTripleTerm))
354357
(rule ExprTripleTermObject
355358
(alt iri RDFLiteral NumericLiteral BooleanLiteral Var ExprTripleTerm))
356359
(rule BrackettedExpression (seq '(' Expression ')'))

‎etc/sparql12.sxp‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -337,19 +337,21 @@
337337
(seq '<<' ReifiedTripleSubject Verb ReifiedTripleObject _ReifiedTriple_1 '>>'))
338338
(rule _ReifiedTriple_1 (cleanup opt) (alt _empty Reifier))
339339
(rule ReifiedTripleSubject
340-
(alt Var iri RDFLiteral NumericLiteral BooleanLiteral BlankNode ReifiedTriple))
340+
(alt Var iri RDFLiteral NumericLiteral BooleanLiteral BlankNode ReifiedTriple
341+
TripleTerm ))
341342
(rule ReifiedTripleObject
342343
(alt Var iri RDFLiteral NumericLiteral BooleanLiteral BlankNode ReifiedTriple
343344
TripleTerm ))
344345
(rule TripleTerm (seq '<<(' TripleTermSubject Verb TripleTermObject ')>>'))
345346
(rule TripleTermSubject
346-
(alt Var iri RDFLiteral NumericLiteral BooleanLiteral BlankNode))
347+
(alt Var iri RDFLiteral NumericLiteral BooleanLiteral BlankNode TripleTerm))
347348
(rule TripleTermObject
348349
(alt Var iri RDFLiteral NumericLiteral BooleanLiteral BlankNode TripleTerm))
349350
(rule TripleTermData
350351
(seq '<<(' TripleTermDataSubject _TripleTermData_1 TripleTermDataObject ')>>'))
351352
(rule _TripleTermData_1 (alt iri 'a'))
352-
(rule TripleTermDataSubject (alt iri RDFLiteral NumericLiteral BooleanLiteral))
353+
(rule TripleTermDataSubject
354+
(alt iri RDFLiteral NumericLiteral BooleanLiteral TripleTermData))
353355
(rule TripleTermDataObject
354356
(alt iri RDFLiteral NumericLiteral BooleanLiteral TripleTermData))
355357
(rule VarOrIri (alt Var iri))
@@ -427,7 +429,8 @@
427429
BooleanLiteral Var ExprTripleTerm ))
428430
(rule ExprTripleTerm
429431
(seq '<<(' ExprTripleTermSubject Verb ExprTripleTermObject ')>>'))
430-
(rule ExprTripleTermSubject (alt iri RDFLiteral NumericLiteral BooleanLiteral Var))
432+
(rule ExprTripleTermSubject
433+
(alt iri RDFLiteral NumericLiteral BooleanLiteral Var ExprTripleTerm))
431434
(rule ExprTripleTermObject
432435
(alt iri RDFLiteral NumericLiteral BooleanLiteral Var ExprTripleTerm))
433436
(rule BrackettedExpression (seq '(' Expression ')'))

‎lib/sparql/grammar/meta.rb‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# This file is automatically generated by ebnf version 2.5.0
1+
# This file is automatically generated by ebnf version 2.6.0
22
# Derived from etc/sparql12.bnf
33
module SPARQL::Grammar::Meta
44
RULES = [
@@ -263,14 +263,14 @@ module SPARQL::Grammar::Meta
263263
EBNF::Rule.new(:VarOrTerm, nil, [:alt, :Var, :iri, :RDFLiteral, :NumericLiteral, :BooleanLiteral, :BlankNode, :NIL, :TripleTerm]).extend(EBNF::PEG::Rule),
264264
EBNF::Rule.new(:ReifiedTriple, nil, [:seq, "<<", :ReifiedTripleSubject, :Verb, :ReifiedTripleObject, :_ReifiedTriple_1, ">>"]).extend(EBNF::PEG::Rule),
265265
EBNF::Rule.new(:_ReifiedTriple_1, nil, [:opt, :Reifier]).extend(EBNF::PEG::Rule),
266-
EBNF::Rule.new(:ReifiedTripleSubject, nil, [:alt, :Var, :iri, :RDFLiteral, :NumericLiteral, :BooleanLiteral, :BlankNode, :ReifiedTriple]).extend(EBNF::PEG::Rule),
266+
EBNF::Rule.new(:ReifiedTripleSubject, nil, [:alt, :Var, :iri, :RDFLiteral, :NumericLiteral, :BooleanLiteral, :BlankNode, :ReifiedTriple, :TripleTerm]).extend(EBNF::PEG::Rule),
267267
EBNF::Rule.new(:ReifiedTripleObject, nil, [:alt, :Var, :iri, :RDFLiteral, :NumericLiteral, :BooleanLiteral, :BlankNode, :ReifiedTriple, :TripleTerm]).extend(EBNF::PEG::Rule),
268268
EBNF::Rule.new(:TripleTerm, nil, [:seq, "<<(", :TripleTermSubject, :Verb, :TripleTermObject, ")>>"]).extend(EBNF::PEG::Rule),
269-
EBNF::Rule.new(:TripleTermSubject, nil, [:alt, :Var, :iri, :RDFLiteral, :NumericLiteral, :BooleanLiteral, :BlankNode]).extend(EBNF::PEG::Rule),
269+
EBNF::Rule.new(:TripleTermSubject, nil, [:alt, :Var, :iri, :RDFLiteral, :NumericLiteral, :BooleanLiteral, :BlankNode, :TripleTerm]).extend(EBNF::PEG::Rule),
270270
EBNF::Rule.new(:TripleTermObject, nil, [:alt, :Var, :iri, :RDFLiteral, :NumericLiteral, :BooleanLiteral, :BlankNode, :TripleTerm]).extend(EBNF::PEG::Rule),
271271
EBNF::Rule.new(:TripleTermData, nil, [:seq, "<<(", :TripleTermDataSubject, :_TripleTermData_1, :TripleTermDataObject, ")>>"]).extend(EBNF::PEG::Rule),
272272
EBNF::Rule.new(:_TripleTermData_1, nil, [:alt, :iri, "a"]).extend(EBNF::PEG::Rule),
273-
EBNF::Rule.new(:TripleTermDataSubject, nil, [:alt, :iri, :RDFLiteral, :NumericLiteral, :BooleanLiteral]).extend(EBNF::PEG::Rule),
273+
EBNF::Rule.new(:TripleTermDataSubject, nil, [:alt, :iri, :RDFLiteral, :NumericLiteral, :BooleanLiteral, :TripleTermData]).extend(EBNF::PEG::Rule),
274274
EBNF::Rule.new(:TripleTermDataObject, nil, [:alt, :iri, :RDFLiteral, :NumericLiteral, :BooleanLiteral, :TripleTermData]).extend(EBNF::PEG::Rule),
275275
EBNF::Rule.new(:VarOrIri, nil, [:alt, :Var, :iri]).extend(EBNF::PEG::Rule),
276276
EBNF::Rule.new(:Var, nil, [:alt, :VAR1, :VAR2]).extend(EBNF::PEG::Rule),
@@ -316,7 +316,7 @@ module SPARQL::Grammar::Meta
316316
EBNF::Rule.new(:_UnaryExpression_3, nil, [:seq, "-", :PrimaryExpression]).extend(EBNF::PEG::Rule),
317317
EBNF::Rule.new(:PrimaryExpression, nil, [:alt, :BrackettedExpression, :BuiltInCall, :iriOrFunction, :RDFLiteral, :NumericLiteral, :BooleanLiteral, :Var, :ExprTripleTerm]).extend(EBNF::PEG::Rule),
318318
EBNF::Rule.new(:ExprTripleTerm, nil, [:seq, "<<(", :ExprTripleTermSubject, :Verb, :ExprTripleTermObject, ")>>"]).extend(EBNF::PEG::Rule),
319-
EBNF::Rule.new(:ExprTripleTermSubject, nil, [:alt, :iri, :RDFLiteral, :NumericLiteral, :BooleanLiteral, :Var]).extend(EBNF::PEG::Rule),
319+
EBNF::Rule.new(:ExprTripleTermSubject, nil, [:alt, :iri, :RDFLiteral, :NumericLiteral, :BooleanLiteral, :Var, :ExprTripleTerm]).extend(EBNF::PEG::Rule),
320320
EBNF::Rule.new(:ExprTripleTermObject, nil, [:alt, :iri, :RDFLiteral, :NumericLiteral, :BooleanLiteral, :Var, :ExprTripleTerm]).extend(EBNF::PEG::Rule),
321321
EBNF::Rule.new(:BrackettedExpression, nil, [:seq, "(", :Expression, ")"]).extend(EBNF::PEG::Rule),
322322
EBNF::Rule.new(:BuiltInCall, nil, [:alt, :Aggregate, :_BuiltInCall_1, :_BuiltInCall_2, :_BuiltInCall_3, :_BuiltInCall_4, :_BuiltInCall_5, :_BuiltInCall_6, :_BuiltInCall_7, :_BuiltInCall_8, :_BuiltInCall_9, :_BuiltInCall_10, :_BuiltInCall_11, :_BuiltInCall_12, :_BuiltInCall_13, :_BuiltInCall_14, :SubstringExpression, :_BuiltInCall_15, :StrReplaceExpression, :_BuiltInCall_16, :_BuiltInCall_17, :_BuiltInCall_18, :_BuiltInCall_19, :_BuiltInCall_20, :_BuiltInCall_21, :_BuiltInCall_22, :_BuiltInCall_23, :_BuiltInCall_24, :_BuiltInCall_25, :_BuiltInCall_26, :_BuiltInCall_27, :_BuiltInCall_28, :_BuiltInCall_29, :_BuiltInCall_30, :_BuiltInCall_31, :_BuiltInCall_32, :_BuiltInCall_33, :_BuiltInCall_34, :_BuiltInCall_35, :_BuiltInCall_36, :_BuiltInCall_37, :_BuiltInCall_38, :_BuiltInCall_39, :_BuiltInCall_40, :_BuiltInCall_41, :_BuiltInCall_42, :_BuiltInCall_43, :_BuiltInCall_44, :_BuiltInCall_45, :_BuiltInCall_46, :_BuiltInCall_47, :_BuiltInCall_48, :_BuiltInCall_49, :_BuiltInCall_50, :_BuiltInCall_51, :RegexExpression, :ExistsFunc, :NotExistsFunc, :_BuiltInCall_52, :_BuiltInCall_53, :_BuiltInCall_54, :_BuiltInCall_55, :_BuiltInCall_56]).extend(EBNF::PEG::Rule),

0 commit comments

Comments
 (0)