From 94ed8c38730b395d421f0615f493a068407d6096 Mon Sep 17 00:00:00 2001 From: Tpt Date: Fri, 18 May 2018 22:06:51 +0200 Subject: [PATCH] Debugs the Turtle parser --- src/rio/ntriples/ntriples_grammar.rustpeg | 4 ++-- src/rio/turtle/turtle_grammar.rustpeg | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/rio/ntriples/ntriples_grammar.rustpeg b/src/rio/ntriples/ntriples_grammar.rustpeg index 549ac4ff..6a245287 100644 --- a/src/rio/ntriples/ntriples_grammar.rustpeg +++ b/src/rio/ntriples/ntriples_grammar.rustpeg @@ -85,10 +85,10 @@ ECHAR -> char = '\\' c: $([tbnrf"'\\]) { PN_CHARS_BASE -> () = [A-Za-z\u{00C0}-\u{00D6}\u{00D8}-\u{00F6}\u{00F8}-\u{02FF}\u{0370}-\u{037D}\u{037F}-\u{1FFF}\u{200C}-\u{200D}\u{2070}-\u{218F}\u{2C00}-\u{2FEF}\u{3001}-\u{D7FF}\u{F900}-\u{FDCF}\u{FDF0}-\u{FFFD}] //[158s] -PN_CHARS_U -> () = PN_CHARS_BASE / '_' / ':' +PN_CHARS_U -> () = '_' / ':' / PN_CHARS_BASE //[160s] -PN_CHARS -> () = PN_CHARS_U / [\-0-9\u{00B7}\u{0300}-\u{036F}\u{203F}-\u{2040}] +PN_CHARS -> () = [\-0-9\u{00B7}\u{0300}-\u{036F}\u{203F}-\u{2040}] / PN_CHARS_U //[162s] HEX -> () = ([0-9A-Fa-f]) diff --git a/src/rio/turtle/turtle_grammar.rustpeg b/src/rio/turtle/turtle_grammar.rustpeg index 578e1eaa..33adacba 100644 --- a/src/rio/turtle/turtle_grammar.rustpeg +++ b/src/rio/turtle/turtle_grammar.rustpeg @@ -115,9 +115,9 @@ collection_value -> Term = o:object_value _ { o } //[16] NumericLiteral -> Literal = - i:$(INTEGER) { data_factory.typed_literal(i, data_factory.named_node("http://www.w3.org/2001/XMLSchema#integer")) } / + d:$(DOUBLE) { data_factory.typed_literal(d, data_factory.named_node("http://www.w3.org/2001/XMLSchema#double")) } / d:$(DECIMAL) { data_factory.typed_literal(d, data_factory.named_node("http://www.w3.org/2001/XMLSchema#decimal")) } / - d:$(DOUBLE) { data_factory.typed_literal(d, data_factory.named_node("http://www.w3.org/2001/XMLSchema#double")) } + i:$(INTEGER) { data_factory.typed_literal(i, data_factory.named_node("http://www.w3.org/2001/XMLSchema#integer")) } //[128s] RDFLiteral -> Literal = @@ -131,7 +131,7 @@ BooleanLiteral -> Literal = "false" { data_factory.typed_literal("false", data_factory.named_node("http://www.w3.org/2001/XMLSchema#boolean")) } //[17] -String -> String = STRING_LITERAL_QUOTE / STRING_LITERAL_SINGLE_QUOTE / STRING_LITERAL_LONG_SINGLE_QUOTE / STRING_LITERAL_LONG_QUOTE +String -> String = STRING_LITERAL_LONG_SINGLE_QUOTE / STRING_LITERAL_LONG_QUOTE / STRING_LITERAL_QUOTE / STRING_LITERAL_SINGLE_QUOTE //[135s] iri -> NamedNode = i:(IRIREF / PrefixedName) { @@ -243,16 +243,16 @@ ANON -> () = "[" WS* "]" PN_CHARS_BASE -> () = [A-Za-z\u{00C0}-\u{00D6}\u{00D8}-\u{00F6}\u{00F8}-\u{02FF}\u{0370}-\u{037D}\u{037F}-\u{1FFF}\u{200C}-\u{200D}\u{2070}-\u{218F}\u{2C00}-\u{2FEF}\u{3001}-\u{D7FF}\u{F900}-\u{FDCF}\u{FDF0}-\u{FFFD}] //[164s] -PN_CHARS_U -> () = PN_CHARS_BASE / "_" +PN_CHARS_U -> () = "_" / PN_CHARS_BASE //[166s] -PN_CHARS -> () = PN_CHARS_U / [\-0-9\u{00B7}\u{0300}-\u{036F}\u{203F}-\u{2040}] +PN_CHARS -> () = [\-0-9\u{00B7}\u{0300}-\u{036F}\u{203F}-\u{2040}] / PN_CHARS_U //[167s] PN_PREFIX -> () = PN_CHARS_BASE PN_CHARS* ("." PN_CHARS+)* //[168s] -PN_LOCAL -> () = (PN_CHARS_U / ":" / [0-9] / PLX) (PN_CHARS / ":" / PLX)* ("." (PN_CHARS / ":" / PLX)+)* +PN_LOCAL -> () = (":" / [0-9] / PN_CHARS_U / PLX) (":" / PN_CHARS / PLX)* ("." (":" / PN_CHARS / PLX)+)* //[169s] PLX -> String =