Skip to content

Empty hierarchical #5

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.

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
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions src/Data/URI/Authority.purs
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,16 @@ import Data.URI.UserInfo
import Global (readInt)
import qualified Data.String as S
import Text.Parsing.StringParser (Parser(), fail)
import Text.Parsing.StringParser.Combinators (optionMaybe, sepBy1)
import Text.Parsing.StringParser.Combinators (optionMaybe, sepBy)
import Text.Parsing.StringParser.String (string)

parseAuthority :: Parser Authority
parseAuthority = do
ui <- optionMaybe parseUserInfo
hosts <- flip sepBy1 (string ",") $ Tuple <$> parseHost
<*> optionMaybe (string ":" *> parsePort)
hosts <- flip sepBy (string ",")
$ Tuple
<$> parseHost
<*> optionMaybe (string ":" *> parsePort)
return $ Authority ui (fromList hosts)

parsePort :: Parser Port
Expand Down
15 changes: 11 additions & 4 deletions src/Data/URI/HierarchicalPart.purs
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,17 @@ import Text.Parsing.StringParser.Combinators (optionMaybe)
import Text.Parsing.StringParser.String (string)

parseHierarchicalPart :: Parser HierarchicalPart
parseHierarchicalPart = (HierarchicalPart <$> optionMaybe (string "//" *> parseAuthority) <*> parsePathAbEmpty parseURIPathAbs)
<|> (HierarchicalPart Nothing <$> ((Just <$> parsePathAbsolute parseURIPathAbs)
<|> (Just <$> parsePathRootless parseURIPathAbs)
<|> pure Nothing))
parseHierarchicalPart =
(HierarchicalPart
<$> optionMaybe (string "//" *> parseAuthority)
<*> parsePathAbEmpty parseURIPathAbs)

<|> (HierarchicalPart Nothing
<$> ((Just <$> parsePathAbsolute parseURIPathAbs)
<|>
(Just <$> parsePathRootless parseURIPathAbs)
<|>
pure Nothing))

printHierPart :: HierarchicalPart -> String
printHierPart (HierarchicalPart a p) =
Expand Down
11 changes: 10 additions & 1 deletion src/Data/URI/Host.purs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,16 @@ parseIPv4Address = IPv4Address <$> rxPat pattern <?> "IPv4 address"
octet = "(1[0-9]{2}|[1-9][0-9]|[0-9]|2[0-4][0-9]|25[0-5])"

parseRegName :: Parser Host
parseRegName = NameAddress <$> try (joinWith "" <$> many1 (parseUnreserved <|> parsePCTEncoded <|> parseSubDelims))
parseRegName =
NameAddress
<$> try
(joinWith ""
<$> many1 (parseUnreserved
<|>
parsePCTEncoded
<|>
parseSubDelims)
)

printHost :: Host -> String
printHost (IPv6Address i) = "[" ++ i ++ "]"
Expand Down
1 change: 1 addition & 0 deletions test/Main.purs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import Text.Parsing.StringParser


main = do
test runParseURIRef "sql2:///?q=foo&var.bar=baz"
test runParseURIRef "mongodb://localhost"
test runParseURIRef "http://en.wikipedia.org/wiki/URI_scheme"
test runParseURIRef "http://local.slamdata.com/?#?sort=asc&q=path%3A%2F&salt=1177214"
Expand Down