Skip to content
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

visited field of State appears to be unnecessary #50

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

visited field of State appears to be unnecessary #50

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
29 changes: 14 additions & 15 deletions src/Url/Parser.elm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,7 @@ type Parser a b =


type alias State value =
{ visited : List String
, unvisited : List String
{ unvisited : List String
, params : Dict String (List String)
, frag : Maybe String
, value : value
Expand Down Expand Up @@ -111,14 +110,14 @@ The path segment must be an exact match!
-}
s : String -> Parser a a
s str =
Parser <| \{ visited, unvisited, params, frag, value } ->
Parser <| \{ unvisited, params, frag, value } ->
case unvisited of
[] ->
[]

next :: rest ->
if next == str then
[ State (next :: visited) rest params frag value ]
[ State rest params frag value ]

else
[]
Expand All @@ -143,15 +142,15 @@ You can use it to define something like “only CSS files” like this:
-}
custom : String -> (String -> Maybe a) -> Parser (a -> b) b
custom tipe stringToSomething =
Parser <| \{ visited, unvisited, params, frag, value } ->
Parser <| \{ unvisited, params, frag, value } ->
case unvisited of
[] ->
[]

next :: rest ->
case stringToSomething next of
Just nextValue ->
[ State (next :: visited) rest params frag (value nextValue) ]
[ State rest params frag (value nextValue) ]

Nothing ->
[]
Expand Down Expand Up @@ -205,14 +204,14 @@ slash (Parser parseBefore) (Parser parseAfter) =
-}
map : a -> Parser a b -> Parser (b -> c) c
map subValue (Parser parseArg) =
Parser <| \{ visited, unvisited, params, frag, value } ->
Parser <| \{ unvisited, params, frag, value } ->
List.map (mapState value) <| parseArg <|
State visited unvisited params frag subValue
State unvisited params frag subValue


mapState : (a -> b) -> State a -> State b
mapState func { visited, unvisited, params, frag, value } =
State visited unvisited params frag (func value)
mapState func { unvisited, params, frag, value } =
State unvisited params frag (func value)


{-| Try a bunch of different path parsers.
Expand Down Expand Up @@ -321,8 +320,8 @@ segments.
-}
query : Query.Parser query -> Parser (query -> a) a
query (Q.Parser queryParser) =
Parser <| \{ visited, unvisited, params, frag, value } ->
[ State visited unvisited params frag (value (queryParser params))
Parser <| \{ unvisited, params, frag, value } ->
[ State unvisited params frag (value (queryParser params))
]


Expand Down Expand Up @@ -350,8 +349,8 @@ be handy for handling links to DOM elements within a page. Pages like this one!
-}
fragment : (Maybe String -> fragment) -> Parser (fragment -> a) a
fragment toFrag =
Parser <| \{ visited, unvisited, params, frag, value } ->
[ State visited unvisited params frag (value (toFrag frag))
Parser <| \{ unvisited, params, frag, value } ->
[ State unvisited params frag (value (toFrag frag))
]


Expand Down Expand Up @@ -402,7 +401,7 @@ the initial URL and any changes.
parse : Parser (a -> a) a -> Url -> Maybe a
parse (Parser parser) url =
getFirstMatch <| parser <|
State [] (preparePath url.path) (prepareQuery url.query) url.fragment identity
State (preparePath url.path) (prepareQuery url.query) url.fragment identity


getFirstMatch : List (State a) -> Maybe a
Expand Down