diff --git a/etc/turtle.html b/etc/turtle.html index a9f59ea..4d4bf5b 100644 --- a/etc/turtle.html +++ b/etc/turtle.html @@ -2,272 +2,228 @@ - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - - + + - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - + - - @@ -336,51 +292,43 @@ - + - - + - - + - - + - - + - - + - - + - - + - diff --git a/lib/ebnf/ll1/lexer.rb b/lib/ebnf/ll1/lexer.rb index 3aa8a73..7501a6f 100644 --- a/lib/ebnf/ll1/lexer.rb +++ b/lib/ebnf/ll1/lexer.rb @@ -201,7 +201,7 @@ def shift # @param [Array[Symbol]] types Optional set of types for restricting terminals examined # @return [Token] def recover(*types) - until scanner.eos? || tok = match_token(*types) + until scanner.eos? || tok = match_token(*types) if scanner.skip_until(@whitespace || /\s+/m).nil? # Skip past current "token" # No whitespace at the end, must be and end of string scanner.terminate diff --git a/lib/ebnf/writer.rb b/lib/ebnf/writer.rb index edbd955..8b35631 100644 --- a/lib/ebnf/writer.rb +++ b/lib/ebnf/writer.rb @@ -133,7 +133,8 @@ def initialize(rules, out: $stdout, html: false, format: :ebnf, validate: false, formatted_rules = rules.map do |rule| if rule.kind == :terminals || rule.kind == :pass OpenStruct.new(id: ("@#{rule.kind}"), - sym: nil, + class: :declaration, + sym: rule.kind, assign: nil, formatted: ( rule.kind == :terminals ? @@ -161,6 +162,7 @@ def initialize(rules, out: $stdout, html: false, format: :ebnf, validate: false, end lines << OpenStruct.new(id: ((ndx == 0 ? "[#{rule.id}]" : "") if rule.id), sym: (rule.sym if ndx == 0 || format == :abnf), + class: :production, assign: assign, formatted: formatted) end @@ -170,6 +172,7 @@ def initialize(rules, out: $stdout, html: false, format: :ebnf, validate: false, lines else OpenStruct.new(id: ("[#{rule.id}]" if rule.id), + class: :production, sym: rule.sym, assign: (format == :ebnf ? '::=' : '='), formatted: (formatted_expr + (format == :isoebnf ? ' ;' : ''))) @@ -708,17 +711,16 @@ def format_isoebnf_range(string) chars.length == 1 ? chars.last.inspect : chars.unshift(:alt) end - ERB_DESC = %q( - -
[1]turtleDoc ::= statement*
[2]statement ::= directive | (triples ".")
[3]directive ::= prefixID | base | sparqlPrefix | sparqlBase
[4]prefixID ::= "@prefix" PNAME_NS IRIREF "."
[5]base ::= "@base" IRIREF "."
[28s]sparqlPrefix ::= SPARQL_PREFIX PNAME_NS IRIREF
[29s]sparqlBase ::= SPARQL_BASE IRIREF
[6]triples ::= (subject predicateObjectList) | (blankNodePropertyList predicateObjectList?)
[7]predicateObjectList ::= verb objectList (";" (verb objectList)?)*
[8]objectList ::= object ("," object)*
[9]verb ::= predicate | "a"
[10]subject ::= iri | BlankNode | collection
[11]predicate ::= iri
[12]object ::= iri | BlankNode | collection | blankNodePropertyList | literal
[13]literal ::= RDFLiteral | NumericLiteral | BooleanLiteral
[14]blankNodePropertyList ::= "[" predicateObjectList "]"
[15]collection ::= "(" object* ")"
[16]NumericLiteral ::= INTEGER | DECIMAL | DOUBLE
[128s]RDFLiteral ::= String (LANGTAG | ("^^" iri))?
[133s]BooleanLiteral ::= "true" | "false"
[17]String ::= STRING_LITERAL_QUOTE | STRING_LITERAL_SINGLE_QUOTE | STRING_LITERAL_LONG_SINGLE_QUOTE | STRING_LITERAL_LONG_QUOTE
[135s]iri ::= IRIREF | PrefixedName
[136s]PrefixedName ::= PNAME_LN | PNAME_NS
[137s]BlankNode ::= BLANK_NODE_LABEL | ANON
@terminals
@terminals # Productions for terminals
[18]IRIREF ::= "<" (([^<>"{}|^`\] - [#x00-#x20]) | UCHAR)* ">"
[139s]PNAME_NS ::= PN_PREFIX? ":"
[140s]PNAME_LN ::= PNAME_NS PN_LOCAL
[141s]BLANK_NODE_LABEL ::= "_:" (PN_CHARS_U | [0-9]) ((PN_CHARS | ".")* PN_CHARS)?
[144s]LANGTAG ::= "@" [a-zA-Z]+ ("-" [a-zA-Z0-9]+)*
[19]INTEGER ::= [+-]? [0-9]+
[20]DECIMAL ::= [+-]? ([0-9]* "." [0-9]+)
[21]DOUBLE ::= [+-]? (([0-9]+ "." [0-9]* EXPONENT) | ("." [0-9]+ EXPONENT) | ([0-9]+ EXPONENT))
[154s]EXPONENT ::= [eE] [+-]? [0-9]+
[22]STRING_LITERAL_QUOTE ::= '"' ([^>"#x5C#x0A#x0D] | ECHAR | UCHAR)* '"'
[23]STRING_LITERAL_SINGLE_QUOTE ::= "'" ([^#x27#x5C#x0A#x0D] | ECHAR | UCHAR)* "'"
[24]STRING_LITERAL_LONG_SINGLE_QUOTE ::= "'''" (("'" | "''")? ([^'\] | ECHAR | UCHAR))* "'''"
[25]STRING_LITERAL_LONG_QUOTE ::= '"""' (('"' | '""')? ([^"\] | ECHAR | UCHAR))* '"""'
[26]UCHAR ::= ("u" HEX HEX HEX HEX) | ("U" HEX HEX HEX HEX HEX HEX HEX HEX)
[159s]ECHAR ::= "\" [tbnrf"']
[28t]SPARQL_PREFIX ::= [Pp] [Rr] [Ee] [Ff] [Ii] [Xx]
[29t]SPARQL_BASE ::= [Bb] [Aa] [Ss] [Ee]
[161s]WS ::= #x20 | #x09 | #x0D | #x0A
[162s]ANON ::= "[" WS* "]"
[163s]PN_CHARS_BASE ::= [A-Z]
| [#x00010000-#x000EFFFF]
[164s]PN_CHARS_U ::= PN_CHARS_BASE | "_"
[166s]PN_CHARS ::= PN_CHARS_U | "-" | [0-9] | #xB7 | [#x0300-#x036F] | [#x203F-#x2040]
[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))?
[169s]PLX ::= PERCENT | PN_LOCAL_ESC
[170s]PERCENT ::= "%" HEX HEX
[171s]HEX ::= [0-9A-Fa-f]
[172s]PN_LOCAL_ESC ::= "\" ("_" | "~" | "." | "-" | "!" | "$" | "&" | "'" | "(" | ")" | "*" | "+" | "," | ";" | "=" | "/" | "?" | "#" | "@" | "%")
+ ERB_DESC = %(\n) + + %q(
<% for rule in @rules %> - > + > <% if rule.id %> ><%= rule.id %> <% end %> <% if rule.sym %> - + <% end %>
<%== rule.sym %><%== (rule.sym unless rule.class == :declaration) %><%= rule.assign %> <%= rule.formatted %>