Skip to content

Commit 4e2630b

Browse files
committed
LANGDIR => LANG_DIR.
1 parent 0dd3ed0 commit 4e2630b

3 files changed

Lines changed: 7 additions & 7 deletions

File tree

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ see <https://unlicense.org/> or the accompanying {file:UNLICENSE} file.
497497
[SPARQL doc]: https://ruby-rdf.github.io/sparql
498498
[RDF 1.0]: https://www.w3.org/TR/2004/REC-rdf-concepts-20040210/
499499
[RDF 1.1]: https://www.w3.org/TR/rdf11-concepts/
500-
[RDF 1.1]: https://www.w3.org/TR/rdf12-concepts/
500+
[RDF 1.2]: https://www.w3.org/TR/rdf12-concepts/
501501
[SPARQL 1.1]: https://www.w3.org/TR/sparql11-query/
502502
[RDF.rb]: https://ruby-rdf.github.io/
503503
[RDF::DO]: https://ruby-rdf.github.io/rdf-do

etc/n-triples.ebnf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ triple ::= subject predicate object '.'
33
subject ::= IRIREF | BLANK_NODE_LABEL | quotedTriple
44
predicate ::= IRIREF
55
object ::= IRIREF | BLANK_NODE_LABEL | literal | quotedTriple
6-
literal ::= STRING_LITERAL_QUOTE ('^^' IRIREF | LANGDIR )?
6+
literal ::= STRING_LITERAL_QUOTE ('^^' IRIREF | LANG_DIR )?
77
quotedTriple ::= '<<' subject predicate object '>>'
88

99
@terminals
1010

1111
IRIREF ::= '<' ([^#x00-#x20<>"{}|^`\] | UCHAR)* '>'
1212
BLANK_NODE_LABEL ::= '_:' ( PN_CHARS_U | [0-9] ) ((PN_CHARS|'.')* PN_CHARS)?
13-
LANGDIR ::= "@" [a-zA-Z]+ ( "-" [a-zA-Z0-9]+ )* ('--' [a-zA-Z]+)?`
13+
LANG_DIR ::= "@" [a-zA-Z]+ ( "-" [a-zA-Z0-9]+ )* ('--' [a-zA-Z]+)?`
1414
STRING_LITERAL_QUOTE ::= '"' ( [^#x22#x5C#xA#xD] | ECHAR | UCHAR )* '"'
1515
UCHAR ::= ( "\u" HEX HEX HEX HEX )
1616
| ( "\U" HEX HEX HEX HEX HEX HEX HEX HEX )

lib/rdf/ntriples/reader.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ class Reader < RDF::Reader
6767

6868
IRIREF = /<((?:#{IRI_RANGE}|#{UCHAR})*)>/.freeze
6969
BLANK_NODE_LABEL = /_:((?:[0-9]|#{PN_CHARS_U})(?:(?:#{PN_CHARS}|\.)*#{PN_CHARS})?)/.freeze
70-
LANGDIR = /@([a-zA-Z]+(?:-[a-zA-Z0-9]+)*(?:--[a-zA-Z]+)?)/.freeze
70+
LANG_DIR = /@([a-zA-Z]+(?:-[a-zA-Z0-9]+)*(?:--[a-zA-Z]+)?)/.freeze
7171
STRING_LITERAL_QUOTE = /"((?:[^\"\\\n\r]|#{ECHAR}|#{UCHAR})*)"/.freeze
7272

7373
ST_START = /^<</.freeze
@@ -78,7 +78,7 @@ class Reader < RDF::Reader
7878
NODEID = /^#{BLANK_NODE_LABEL}/.freeze
7979
URIREF = /^#{IRIREF}/.freeze
8080
LITERAL_PLAIN = /^#{STRING_LITERAL_QUOTE}/.freeze
81-
LITERAL_WITH_LANGUAGE = /^#{STRING_LITERAL_QUOTE}#{LANGDIR}/.freeze
81+
LITERAL_WITH_LANGUAGE = /^#{STRING_LITERAL_QUOTE}#{LANG_DIR}/.freeze
8282
LITERAL_WITH_DATATYPE = /^#{STRING_LITERAL_QUOTE}\^\^#{IRIREF}/.freeze
8383
DATATYPE_URI = /^\^\^#{IRIREF}/.freeze
8484
LITERAL = Regexp.union(LITERAL_WITH_LANGUAGE, LITERAL_WITH_DATATYPE, LITERAL_PLAIN).freeze
@@ -88,7 +88,7 @@ class Reader < RDF::Reader
8888
END_OF_STATEMENT = /^\s*\.\s*(?:#.*)?$/.freeze
8989

9090
# LANGTAG is deprecated
91-
LANGTAG = LANGDIR
91+
LANGTAG = LANG_DIR
9292

9393
##
9494
# Reconstructs an RDF value from its serialized N-Triples
@@ -294,7 +294,7 @@ def read_literal
294294
if literal_str = match(LITERAL_PLAIN)
295295
literal_str = self.class.unescape(literal_str)
296296
literal = case
297-
when lang_dir = match(LANGDIR)
297+
when lang_dir = match(LANG_DIR)
298298
language, direction = lang_dir.split('--')
299299
RDF::Literal.new(literal_str, language: language, direction: direction)
300300
when datatype = match(/^(\^\^)/) # FIXME

0 commit comments

Comments
 (0)