Skip to content

Comply with RFC 3986 #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 11, 2021
Merged

Comply with RFC 3986 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions src/routing_tree_leex.xrl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
Definitions.
PathSegment = (_|[a-zA-Z]|[0-9])*
PathSegment = (_|-|\.|~|:|/|\[|\]|@|!|\$|\'|\(|\)|\*|\+|,|;|\%|[a-zA-Z]|[0-9])*
Divider = (\/)

Rules.

{Divider}+ : {token, {'divider', TokenLine}}.
\:{PathSegment} : {token, {'binding', TokenLine, strip(TokenChars)}}.
\[\.\.\.\] : {token, {'wildcard', TokenLine, '...'}}.
\[ : {token, {'optional_left', TokenLine}}.
\] : {token, {'optional_right', TokenLine}}.
\:{PathSegment} : {token, {'binding', TokenLine, strip(TokenChars)}}.
\? : {token, {'query_start', TokenLine}}.
\& : {token, {'ampersand', TokenLine}}.
\= : {token, {'equals', TokenLine}}.
Expand Down
17 changes: 2 additions & 15 deletions src/routing_tree_parser.yrl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Nonterminals url_path path_segment query optional_segment basic_element.
Nonterminals url_path path_segment query basic_element.

Terminals 'divider' 'binding' 'wildcard' 'optional_left' 'optional_right' 'segment' 'query_start' 'ampersand' 'equals'.
Terminals 'divider' 'binding' 'wildcard' 'segment' 'query_start' 'ampersand' 'equals'.

Rootsymbol url_path.

Expand All @@ -10,14 +10,6 @@ basic_element ->
basic_element ->
'segment': '$1'.

%% Optional segments can only be at the end of this
optional_segment ->
'divider' 'optional_left' basic_element 'optional_right': [optional('$3')].
optional_segment ->
'divider' 'optional_left' basic_element 'optional_right' query: [optional('$3')|'$5'].
optional_segment ->
'divider' 'optional_left' basic_element 'optional_right' optional_segment: [optional('$3')|'$5'].

query ->
'segment' 'equals' 'segment': [{'query', '$1', '$3'}].
query ->
Expand All @@ -29,8 +21,6 @@ path_segment ->
'divider': [{'segment', 1, ""}].
path_segment ->
'divider' 'wildcard': ['$2'].
path_segment ->
optional_segment: '$1'.
path_segment ->
'divider' basic_element: ['$2'].
path_segment ->
Expand All @@ -44,6 +34,3 @@ url_path ->


Erlang code.

optional(X) ->
{optional, X}.