Compare commits
15 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 7b7e689892 | |||
| 22d13bdf7d | |||
| 3fc9a61afe | |||
| b9d1077425 | |||
| 3cd6d5d4af | |||
| a00af69b56 | |||
| c6ee27fa7a | |||
| 5c4a444231 | |||
| 452117db63 | |||
| 5da4ea66b1 | |||
| 321e203778 | |||
| 1ac5e05e1a | |||
| cc110b414f | |||
| 246706d4fc | |||
| 897124be27 |
2
.github/workflows/test.yml
vendored
2
.github/workflows/test.yml
vendored
@@ -14,7 +14,7 @@ jobs:
|
||||
- uses: actions/checkout@v4
|
||||
- uses: erlef/setup-beam@v1
|
||||
with:
|
||||
otp-version: "28.0.4"
|
||||
otp-version: "28.1"
|
||||
gleam-version: "1.12.0"
|
||||
rebar3-version: "3.25.1"
|
||||
elixir-version: "1.18.4"
|
||||
|
||||
1
.gitignore
vendored
1
.gitignore
vendored
@@ -2,3 +2,4 @@
|
||||
*.ez
|
||||
/build
|
||||
erl_crash.dump
|
||||
node_modules
|
||||
|
||||
10
CHANGELOG.md
10
CHANGELOG.md
@@ -12,3 +12,13 @@
|
||||
|
||||
- Improved parsing performance significantly and reduced memory usage up to 50%
|
||||
- Significantly improved IPV4 parsing performance
|
||||
|
||||
## v2.0.2
|
||||
|
||||
- Minor performance improvement for uris with userinfo
|
||||
- More performance improvements for ascii/digit parsing
|
||||
|
||||
## 2.0.3
|
||||
|
||||
- Minor performance improvement for erlang
|
||||
- Major performance improvement for js
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
name = "gluri"
|
||||
version = "2.0.1"
|
||||
version = "2.0.3"
|
||||
|
||||
# Fill out these fields if you intend to generate HTML documentation or publish
|
||||
# your project to the Hex package manager.
|
||||
|
||||
@@ -16,7 +16,7 @@ packages = [
|
||||
{ name = "gleam_json", version = "3.0.2", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_json", source = "hex", outer_checksum = "874FA3C3BB6E22DD2BB111966BD40B3759E9094E05257899A7C08F5DE77EC049" },
|
||||
{ name = "gleam_otp", version = "1.1.0", build_tools = ["gleam"], requirements = ["gleam_erlang", "gleam_stdlib"], otp_app = "gleam_otp", source = "hex", outer_checksum = "7987CBEBC8060B88F14575DEF546253F3116EBE2A5DA6FD82F38243FCE97C54B" },
|
||||
{ name = "gleam_regexp", version = "1.1.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_regexp", source = "hex", outer_checksum = "9C215C6CA84A5B35BB934A9B61A9A306EC743153BE2B0425A0D032E477B062A9" },
|
||||
{ name = "gleam_stdlib", version = "0.63.1", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "E1D5EC07638F606E48F0EA1556044DD805F2ACE9092A6F6AFBE4A0CC4DA21C2F" },
|
||||
{ name = "gleam_stdlib", version = "0.63.2", build_tools = ["gleam"], requirements = [], otp_app = "gleam_stdlib", source = "hex", outer_checksum = "962B25C667DA07F4CAB32001F44D3C41C1A89E58E3BBA54F183B482CF6122150" },
|
||||
{ name = "gleam_time", version = "1.4.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_time", source = "hex", outer_checksum = "DCDDC040CE97DA3D2A925CDBBA08D8A78681139745754A83998641C8A3F6587E" },
|
||||
{ name = "gleam_yielder", version = "1.1.0", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleam_yielder", source = "hex", outer_checksum = "8E4E4ECFA7982859F430C57F549200C7749823C106759F4A19A78AEA6687717A" },
|
||||
{ name = "gleeunit", version = "1.6.1", build_tools = ["gleam"], requirements = ["gleam_stdlib"], otp_app = "gleeunit", source = "hex", outer_checksum = "FDC68A8C492B1E9B429249062CD9BAC9B5538C6FBF584817205D0998C42E1DAC" },
|
||||
|
||||
18
package-lock.json
generated
Normal file
18
package-lock.json
generated
Normal file
@@ -0,0 +1,18 @@
|
||||
{
|
||||
"name": "uri",
|
||||
"lockfileVersion": 3,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"dependencies": {
|
||||
"mitata": "^1.0.34"
|
||||
}
|
||||
},
|
||||
"node_modules/mitata": {
|
||||
"version": "1.0.34",
|
||||
"resolved": "https://registry.npmjs.org/mitata/-/mitata-1.0.34.tgz",
|
||||
"integrity": "sha512-Mc3zrtNBKIMeHSCQ0XqRLo1vbdIx1wvFV9c8NJAiyho6AjNfMY8bVhbS12bwciUdd1t4rj8099CH3N3NFahaUA==",
|
||||
"license": "MIT"
|
||||
}
|
||||
}
|
||||
}
|
||||
6
package.json
Normal file
6
package.json
Normal file
@@ -0,0 +1,6 @@
|
||||
{
|
||||
"type": "module",
|
||||
"dependencies": {
|
||||
"mitata": "^1.0.34"
|
||||
}
|
||||
}
|
||||
@@ -1,4 +1,3 @@
|
||||
import gleam/bool
|
||||
import gleam/int
|
||||
import gleam/list
|
||||
import gleam/option.{type Option, None, Some}
|
||||
@@ -168,7 +167,7 @@ fn parse_authority(str: String) -> Result(#(Uri, String), Nil) {
|
||||
}
|
||||
|
||||
fn parse_authority_part(str: String) -> Result(#(Uri, String), Nil) {
|
||||
let #(userinfo, rest) = parse_userinfo(str, "")
|
||||
let #(userinfo, rest) = parse_userinfo(str)
|
||||
|
||||
use #(host, rest) <- result.try(parse_host(rest))
|
||||
|
||||
@@ -180,8 +179,14 @@ fn parse_authority_part(str: String) -> Result(#(Uri, String), Nil) {
|
||||
}
|
||||
|
||||
// userinfo = *( unreserved / pct-encoded / sub-delims / ":" )
|
||||
fn parse_userinfo(str: String, userinfo: String) -> #(Option(String), String) {
|
||||
use <- bool.guard(when: !string.contains(str, "@"), return: #(None, str))
|
||||
fn parse_userinfo(str: String) -> #(Option(String), String) {
|
||||
case string.contains(str, "@") {
|
||||
True -> do_parse_userinfo(str, "")
|
||||
False -> #(None, str)
|
||||
}
|
||||
}
|
||||
|
||||
fn do_parse_userinfo(str: String, userinfo: String) -> #(Option(String), String) {
|
||||
case str {
|
||||
"@" <> rest -> #(Some(userinfo), rest)
|
||||
"" -> #(None, userinfo <> str)
|
||||
@@ -202,7 +207,7 @@ fn parse_userinfo(str: String, userinfo: String) -> #(Option(String), String) {
|
||||
str,
|
||||
)
|
||||
{
|
||||
Ok(#(part, rest)) -> parse_userinfo(rest, userinfo <> part)
|
||||
Ok(#(part, rest)) -> do_parse_userinfo(rest, userinfo <> part)
|
||||
Error(_) -> #(None, userinfo <> str)
|
||||
}
|
||||
}
|
||||
@@ -421,7 +426,7 @@ fn parse_ipv4address(str: String) {
|
||||
// / "1" 2DIGIT ; 100-199
|
||||
// / "2" %x30-34 DIGIT ; 200-249
|
||||
// / "25" %x30-35 ; 250-255
|
||||
pub fn parse_dec_octet(str: String) -> Result(#(String, String), Nil) {
|
||||
fn parse_dec_octet(str: String) -> Result(#(String, String), Nil) {
|
||||
try_parsers(
|
||||
[
|
||||
parse_this_then(_, [
|
||||
@@ -486,7 +491,7 @@ pub fn parse_dec_octet(str: String) -> Result(#(String, String), Nil) {
|
||||
}
|
||||
|
||||
// reg-name = *( unreserved / pct-encoded / sub-delims )
|
||||
pub fn parse_reg_name(str: String) {
|
||||
fn parse_reg_name(str: String) {
|
||||
// can't error
|
||||
|
||||
case do_parse_reg_name(str, "") {
|
||||
@@ -722,51 +727,112 @@ fn parse_unreserved(str: String) -> Result(#(String, String), Nil) {
|
||||
|
||||
// sub-delims = "!" / "$" / "&" / "'" / "(" / ")"
|
||||
// / "*" / "+" / "," / ";" / "="
|
||||
fn parse_sub_delim(str: String) {
|
||||
// %21 / %24 / %26 / %27 / %28 / %29
|
||||
// / %2A / %2B / %2C / %3B / %3D
|
||||
@target(erlang)
|
||||
fn parse_sub_delim(str: String) -> Result(#(String, String), Nil) {
|
||||
case string.pop_grapheme(str) {
|
||||
Ok(#("!" as char, tail))
|
||||
| Ok(#("$" as char, tail))
|
||||
| Ok(#("&" as char, tail))
|
||||
| Ok(#("'" as char, tail))
|
||||
| Ok(#("(" as char, tail))
|
||||
| Ok(#(")" as char, tail))
|
||||
| Ok(#("*" as char, tail))
|
||||
| Ok(#("+" as char, tail))
|
||||
| Ok(#("," as char, tail))
|
||||
| Ok(#(";" as char, tail))
|
||||
| Ok(#("=" as char, tail)) -> Ok(#(char, tail))
|
||||
_ -> Error(Nil)
|
||||
}
|
||||
}
|
||||
|
||||
@target(javascript)
|
||||
fn parse_sub_delim(str: String) -> Result(#(String, String), Nil) {
|
||||
case str {
|
||||
"!" as l <> rest
|
||||
| "$" as l <> rest
|
||||
| "&" as l <> rest
|
||||
| "'" as l <> rest
|
||||
| "(" as l <> rest
|
||||
| ")" as l <> rest
|
||||
| "*" as l <> rest
|
||||
| "+" as l <> rest
|
||||
| "," as l <> rest
|
||||
| ";" as l <> rest
|
||||
| "=" as l <> rest -> Ok(#(l, rest))
|
||||
"!" as char <> tail
|
||||
| "$" as char <> tail
|
||||
| "&" as char <> tail
|
||||
| "'" as char <> tail
|
||||
| "(" as char <> tail
|
||||
| ")" as char <> tail
|
||||
| "*" as char <> tail
|
||||
| "+" as char <> tail
|
||||
| "," as char <> tail
|
||||
| ";" as char <> tail
|
||||
| "=" as char <> tail -> Ok(#(char, tail))
|
||||
_ -> Error(Nil)
|
||||
}
|
||||
}
|
||||
|
||||
// DIGIT = %x30–39
|
||||
@target(erlang)
|
||||
fn parse_digit(str: String) -> Result(#(String, String), Nil) {
|
||||
case str {
|
||||
"0" as l <> rest
|
||||
| "1" as l <> rest
|
||||
| "2" as l <> rest
|
||||
| "3" as l <> rest
|
||||
| "4" as l <> rest
|
||||
| "5" as l <> rest
|
||||
| "6" as l <> rest
|
||||
| "7" as l <> rest
|
||||
| "8" as l <> rest
|
||||
| "9" as l <> rest -> Ok(#(l, rest))
|
||||
case string.pop_grapheme(str) {
|
||||
Ok(#("0" as char, tail))
|
||||
| Ok(#("1" as char, tail))
|
||||
| Ok(#("2" as char, tail))
|
||||
| Ok(#("3" as char, tail))
|
||||
| Ok(#("4" as char, tail))
|
||||
| Ok(#("5" as char, tail))
|
||||
| Ok(#("6" as char, tail))
|
||||
| Ok(#("7" as char, tail))
|
||||
| Ok(#("8" as char, tail))
|
||||
| Ok(#("9" as char, tail)) -> Ok(#(char, tail))
|
||||
|
||||
_ -> Error(Nil)
|
||||
}
|
||||
}
|
||||
|
||||
@target(javascript)
|
||||
fn parse_digit(str: String) -> Result(#(String, String), Nil) {
|
||||
case str {
|
||||
"0" as char <> tail
|
||||
| "1" as char <> tail
|
||||
| "2" as char <> tail
|
||||
| "3" as char <> tail
|
||||
| "4" as char <> tail
|
||||
| "5" as char <> tail
|
||||
| "6" as char <> tail
|
||||
| "7" as char <> tail
|
||||
| "8" as char <> tail
|
||||
| "9" as char <> tail -> Ok(#(char, tail))
|
||||
|
||||
_ -> Error(Nil)
|
||||
}
|
||||
}
|
||||
|
||||
// DIGIT (non-zero) = %x31–39
|
||||
@target(erlang)
|
||||
fn parse_digit_nz(str: String) -> Result(#(String, String), Nil) {
|
||||
case string.pop_grapheme(str) {
|
||||
Ok(#("1" as char, tail))
|
||||
| Ok(#("2" as char, tail))
|
||||
| Ok(#("3" as char, tail))
|
||||
| Ok(#("4" as char, tail))
|
||||
| Ok(#("5" as char, tail))
|
||||
| Ok(#("6" as char, tail))
|
||||
| Ok(#("7" as char, tail))
|
||||
| Ok(#("8" as char, tail))
|
||||
| Ok(#("9" as char, tail)) -> Ok(#(char, tail))
|
||||
|
||||
_ -> Error(Nil)
|
||||
}
|
||||
}
|
||||
|
||||
@target(javascript)
|
||||
fn parse_digit_nz(str: String) -> Result(#(String, String), Nil) {
|
||||
case str {
|
||||
"1" as l <> rest
|
||||
| "2" as l <> rest
|
||||
| "3" as l <> rest
|
||||
| "4" as l <> rest
|
||||
| "5" as l <> rest
|
||||
| "6" as l <> rest
|
||||
| "7" as l <> rest
|
||||
| "8" as l <> rest
|
||||
| "9" as l <> rest -> Ok(#(l, rest))
|
||||
"1" as char <> tail
|
||||
| "2" as char <> tail
|
||||
| "3" as char <> tail
|
||||
| "4" as char <> tail
|
||||
| "5" as char <> tail
|
||||
| "6" as char <> tail
|
||||
| "7" as char <> tail
|
||||
| "8" as char <> tail
|
||||
| "9" as char <> tail -> Ok(#(char, tail))
|
||||
|
||||
_ -> Error(Nil)
|
||||
}
|
||||
}
|
||||
@@ -781,60 +847,122 @@ fn parse_digits(str: String, digits: String) {
|
||||
}
|
||||
|
||||
// ALPHA = %x41–5A | %x61–7A
|
||||
@target(erlang)
|
||||
fn parse_alpha(str: String) -> Result(#(String, String), Nil) {
|
||||
case string.pop_grapheme(str) {
|
||||
Ok(#("a" as char, tail))
|
||||
| Ok(#("b" as char, tail))
|
||||
| Ok(#("c" as char, tail))
|
||||
| Ok(#("d" as char, tail))
|
||||
| Ok(#("e" as char, tail))
|
||||
| Ok(#("f" as char, tail))
|
||||
| Ok(#("g" as char, tail))
|
||||
| Ok(#("h" as char, tail))
|
||||
| Ok(#("i" as char, tail))
|
||||
| Ok(#("j" as char, tail))
|
||||
| Ok(#("k" as char, tail))
|
||||
| Ok(#("l" as char, tail))
|
||||
| Ok(#("m" as char, tail))
|
||||
| Ok(#("n" as char, tail))
|
||||
| Ok(#("o" as char, tail))
|
||||
| Ok(#("p" as char, tail))
|
||||
| Ok(#("q" as char, tail))
|
||||
| Ok(#("r" as char, tail))
|
||||
| Ok(#("s" as char, tail))
|
||||
| Ok(#("t" as char, tail))
|
||||
| Ok(#("u" as char, tail))
|
||||
| Ok(#("v" as char, tail))
|
||||
| Ok(#("w" as char, tail))
|
||||
| Ok(#("x" as char, tail))
|
||||
| Ok(#("y" as char, tail))
|
||||
| Ok(#("z" as char, tail))
|
||||
| Ok(#("A" as char, tail))
|
||||
| Ok(#("B" as char, tail))
|
||||
| Ok(#("C" as char, tail))
|
||||
| Ok(#("D" as char, tail))
|
||||
| Ok(#("E" as char, tail))
|
||||
| Ok(#("F" as char, tail))
|
||||
| Ok(#("G" as char, tail))
|
||||
| Ok(#("H" as char, tail))
|
||||
| Ok(#("I" as char, tail))
|
||||
| Ok(#("J" as char, tail))
|
||||
| Ok(#("K" as char, tail))
|
||||
| Ok(#("L" as char, tail))
|
||||
| Ok(#("M" as char, tail))
|
||||
| Ok(#("N" as char, tail))
|
||||
| Ok(#("O" as char, tail))
|
||||
| Ok(#("P" as char, tail))
|
||||
| Ok(#("Q" as char, tail))
|
||||
| Ok(#("R" as char, tail))
|
||||
| Ok(#("S" as char, tail))
|
||||
| Ok(#("T" as char, tail))
|
||||
| Ok(#("U" as char, tail))
|
||||
| Ok(#("V" as char, tail))
|
||||
| Ok(#("W" as char, tail))
|
||||
| Ok(#("X" as char, tail))
|
||||
| Ok(#("Y" as char, tail))
|
||||
| Ok(#("Z" as char, tail)) -> Ok(#(char, tail))
|
||||
|
||||
_ -> Error(Nil)
|
||||
}
|
||||
}
|
||||
|
||||
@target(javascript)
|
||||
fn parse_alpha(str: String) -> Result(#(String, String), Nil) {
|
||||
case str {
|
||||
"a" as l <> rest
|
||||
| "b" as l <> rest
|
||||
| "c" as l <> rest
|
||||
| "d" as l <> rest
|
||||
| "e" as l <> rest
|
||||
| "f" as l <> rest
|
||||
| "g" as l <> rest
|
||||
| "h" as l <> rest
|
||||
| "i" as l <> rest
|
||||
| "j" as l <> rest
|
||||
| "k" as l <> rest
|
||||
| "l" as l <> rest
|
||||
| "m" as l <> rest
|
||||
| "n" as l <> rest
|
||||
| "o" as l <> rest
|
||||
| "p" as l <> rest
|
||||
| "q" as l <> rest
|
||||
| "r" as l <> rest
|
||||
| "s" as l <> rest
|
||||
| "t" as l <> rest
|
||||
| "u" as l <> rest
|
||||
| "v" as l <> rest
|
||||
| "w" as l <> rest
|
||||
| "x" as l <> rest
|
||||
| "y" as l <> rest
|
||||
| "z" as l <> rest
|
||||
| "A" as l <> rest
|
||||
| "B" as l <> rest
|
||||
| "C" as l <> rest
|
||||
| "D" as l <> rest
|
||||
| "E" as l <> rest
|
||||
| "F" as l <> rest
|
||||
| "G" as l <> rest
|
||||
| "H" as l <> rest
|
||||
| "I" as l <> rest
|
||||
| "J" as l <> rest
|
||||
| "K" as l <> rest
|
||||
| "L" as l <> rest
|
||||
| "M" as l <> rest
|
||||
| "N" as l <> rest
|
||||
| "O" as l <> rest
|
||||
| "P" as l <> rest
|
||||
| "Q" as l <> rest
|
||||
| "R" as l <> rest
|
||||
| "S" as l <> rest
|
||||
| "T" as l <> rest
|
||||
| "U" as l <> rest
|
||||
| "V" as l <> rest
|
||||
| "W" as l <> rest
|
||||
| "X" as l <> rest
|
||||
| "Y" as l <> rest
|
||||
| "Z" as l <> rest -> Ok(#(l, rest))
|
||||
"a" as char <> tail
|
||||
| "b" as char <> tail
|
||||
| "c" as char <> tail
|
||||
| "d" as char <> tail
|
||||
| "e" as char <> tail
|
||||
| "f" as char <> tail
|
||||
| "g" as char <> tail
|
||||
| "h" as char <> tail
|
||||
| "i" as char <> tail
|
||||
| "j" as char <> tail
|
||||
| "k" as char <> tail
|
||||
| "l" as char <> tail
|
||||
| "m" as char <> tail
|
||||
| "n" as char <> tail
|
||||
| "o" as char <> tail
|
||||
| "p" as char <> tail
|
||||
| "q" as char <> tail
|
||||
| "r" as char <> tail
|
||||
| "s" as char <> tail
|
||||
| "t" as char <> tail
|
||||
| "u" as char <> tail
|
||||
| "v" as char <> tail
|
||||
| "w" as char <> tail
|
||||
| "x" as char <> tail
|
||||
| "y" as char <> tail
|
||||
| "z" as char <> tail
|
||||
| "A" as char <> tail
|
||||
| "B" as char <> tail
|
||||
| "C" as char <> tail
|
||||
| "D" as char <> tail
|
||||
| "E" as char <> tail
|
||||
| "F" as char <> tail
|
||||
| "G" as char <> tail
|
||||
| "H" as char <> tail
|
||||
| "I" as char <> tail
|
||||
| "J" as char <> tail
|
||||
| "K" as char <> tail
|
||||
| "L" as char <> tail
|
||||
| "M" as char <> tail
|
||||
| "N" as char <> tail
|
||||
| "O" as char <> tail
|
||||
| "P" as char <> tail
|
||||
| "Q" as char <> tail
|
||||
| "R" as char <> tail
|
||||
| "S" as char <> tail
|
||||
| "T" as char <> tail
|
||||
| "U" as char <> tail
|
||||
| "V" as char <> tail
|
||||
| "W" as char <> tail
|
||||
| "X" as char <> tail
|
||||
| "Y" as char <> tail
|
||||
| "Z" as char <> tail -> Ok(#(char, tail))
|
||||
|
||||
_ -> Error(Nil)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -370,30 +370,62 @@ fn unescape_percent(str: String) -> String {
|
||||
}
|
||||
}
|
||||
|
||||
pub fn parse_hex_digit(str) {
|
||||
@target(erlang)
|
||||
pub fn parse_hex_digit(str: String) -> Result(#(String, String), Nil) {
|
||||
case string.pop_grapheme(str) {
|
||||
Ok(#("0" as char, tail))
|
||||
| Ok(#("1" as char, tail))
|
||||
| Ok(#("2" as char, tail))
|
||||
| Ok(#("3" as char, tail))
|
||||
| Ok(#("4" as char, tail))
|
||||
| Ok(#("5" as char, tail))
|
||||
| Ok(#("6" as char, tail))
|
||||
| Ok(#("7" as char, tail))
|
||||
| Ok(#("8" as char, tail))
|
||||
| Ok(#("9" as char, tail))
|
||||
| Ok(#("a" as char, tail))
|
||||
| Ok(#("b" as char, tail))
|
||||
| Ok(#("c" as char, tail))
|
||||
| Ok(#("d" as char, tail))
|
||||
| Ok(#("e" as char, tail))
|
||||
| Ok(#("f" as char, tail))
|
||||
| Ok(#("A" as char, tail))
|
||||
| Ok(#("B" as char, tail))
|
||||
| Ok(#("C" as char, tail))
|
||||
| Ok(#("D" as char, tail))
|
||||
| Ok(#("E" as char, tail))
|
||||
| Ok(#("F" as char, tail)) -> Ok(#(char, tail))
|
||||
|
||||
_ -> Error(Nil)
|
||||
}
|
||||
}
|
||||
|
||||
@target(javascript)
|
||||
pub fn parse_hex_digit(str: String) -> Result(#(String, String), Nil) {
|
||||
case str {
|
||||
"0" as l <> rest
|
||||
| "1" as l <> rest
|
||||
| "2" as l <> rest
|
||||
| "3" as l <> rest
|
||||
| "4" as l <> rest
|
||||
| "5" as l <> rest
|
||||
| "6" as l <> rest
|
||||
| "7" as l <> rest
|
||||
| "8" as l <> rest
|
||||
| "9" as l <> rest
|
||||
| "a" as l <> rest
|
||||
| "b" as l <> rest
|
||||
| "c" as l <> rest
|
||||
| "d" as l <> rest
|
||||
| "e" as l <> rest
|
||||
| "f" as l <> rest
|
||||
| "A" as l <> rest
|
||||
| "B" as l <> rest
|
||||
| "C" as l <> rest
|
||||
| "D" as l <> rest
|
||||
| "E" as l <> rest
|
||||
| "F" as l <> rest -> Ok(#(l, rest))
|
||||
"0" as char <> tail
|
||||
| "1" as char <> tail
|
||||
| "2" as char <> tail
|
||||
| "3" as char <> tail
|
||||
| "4" as char <> tail
|
||||
| "5" as char <> tail
|
||||
| "6" as char <> tail
|
||||
| "7" as char <> tail
|
||||
| "8" as char <> tail
|
||||
| "9" as char <> tail
|
||||
| "a" as char <> tail
|
||||
| "b" as char <> tail
|
||||
| "c" as char <> tail
|
||||
| "d" as char <> tail
|
||||
| "e" as char <> tail
|
||||
| "f" as char <> tail
|
||||
| "A" as char <> tail
|
||||
| "B" as char <> tail
|
||||
| "C" as char <> tail
|
||||
| "D" as char <> tail
|
||||
| "E" as char <> tail
|
||||
| "F" as char <> tail -> Ok(#(char, tail))
|
||||
|
||||
_ -> Error(Nil)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
import gleam/string
|
||||
import gleam/uri as uri2
|
||||
import gluri as uri
|
||||
import gluri/internal/parser
|
||||
import glychee/benchmark
|
||||
import glychee/configuration
|
||||
|
||||
@@ -10,48 +10,49 @@ pub fn main() {
|
||||
configuration.set_pair(configuration.Warmup, 2)
|
||||
configuration.set_pair(configuration.Parallel, 2)
|
||||
|
||||
// pop_benchmark()
|
||||
parse_benchmark()
|
||||
// reg_name_benchmark()
|
||||
// ip_benchmark()
|
||||
}
|
||||
|
||||
@target(erlang)
|
||||
pub fn ip_benchmark() {
|
||||
benchmark.run(
|
||||
[
|
||||
benchmark.Function("ip_benchmark", fn(data) {
|
||||
fn() {
|
||||
let _ = parser.parse_dec_octet(data)
|
||||
Nil
|
||||
}
|
||||
}),
|
||||
],
|
||||
[
|
||||
benchmark.Data("173", "173"),
|
||||
benchmark.Data("5", "5"),
|
||||
benchmark.Data("200", "200"),
|
||||
benchmark.Data("255", "255"),
|
||||
benchmark.Data("fail", "2b"),
|
||||
],
|
||||
)
|
||||
}
|
||||
// @target(erlang)
|
||||
// pub fn ip_benchmark() {
|
||||
// benchmark.run(
|
||||
// [
|
||||
// benchmark.Function("ip_benchmark", fn(data) {
|
||||
// fn() {
|
||||
// let _ = parser.parse_dec_octet(data)
|
||||
// Nil
|
||||
// }
|
||||
// }),
|
||||
// ],
|
||||
// [
|
||||
// benchmark.Data("173", "173"),
|
||||
// benchmark.Data("5", "5"),
|
||||
// benchmark.Data("200", "200"),
|
||||
// benchmark.Data("255", "255"),
|
||||
// benchmark.Data("fail", "2b"),
|
||||
// ],
|
||||
// )
|
||||
// }
|
||||
|
||||
@target(erlang)
|
||||
pub fn reg_name_benchmark() {
|
||||
benchmark.run(
|
||||
[
|
||||
benchmark.Function("reg_name_benchmark", fn(data) {
|
||||
fn() {
|
||||
let _ = parser.parse_reg_name(data)
|
||||
Nil
|
||||
}
|
||||
}),
|
||||
],
|
||||
[
|
||||
benchmark.Data("long", "github.com"),
|
||||
],
|
||||
)
|
||||
}
|
||||
// @target(erlang)
|
||||
// pub fn reg_name_benchmark() {
|
||||
// benchmark.run(
|
||||
// [
|
||||
// benchmark.Function("reg_name_benchmark", fn(data) {
|
||||
// fn() {
|
||||
// let _ = parser.parse_reg_name(data)
|
||||
// Nil
|
||||
// }
|
||||
// }),
|
||||
// ],
|
||||
// [
|
||||
// benchmark.Data("long", "github.com"),
|
||||
// ],
|
||||
// )
|
||||
// }
|
||||
|
||||
@target(erlang)
|
||||
pub fn parse_benchmark() {
|
||||
@@ -75,7 +76,284 @@ pub fn parse_benchmark() {
|
||||
"long",
|
||||
"https://github.com/gleam-lang/stdlib/issues/523#issuecomment-3288230480",
|
||||
),
|
||||
benchmark.Data(
|
||||
"with user",
|
||||
"https://test_name:user%20$$$@github.com/gleam-lang/stdlib/issues/523#issuecomment-3288230480",
|
||||
),
|
||||
benchmark.Data("ipv4", "https://192.255.36.4/"),
|
||||
],
|
||||
)
|
||||
}
|
||||
|
||||
@target(erlang)
|
||||
pub fn pop_benchmark() {
|
||||
benchmark.run(
|
||||
[
|
||||
benchmark.Function("pop", fn(data) { fn() { pop(data, "") } }),
|
||||
benchmark.Function("pop2", fn(data) { fn() { pop4(data, "") } }),
|
||||
benchmark.Function("pop3", fn(data) { fn() { pop5(data, "") } }),
|
||||
benchmark.Function("match", fn(data) { fn() { pop2(data, "") } }),
|
||||
benchmark.Function("match_2", fn(data) { fn() { pop3(data, "") } }),
|
||||
],
|
||||
[
|
||||
// benchmark.Data("long", "abcdefghijklmnopqrstuvwxyz"),
|
||||
benchmark.Data(
|
||||
"with user",
|
||||
"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ",
|
||||
),
|
||||
// benchmark.Data("ipv4", "https://192.255.36.4/"),
|
||||
],
|
||||
)
|
||||
}
|
||||
|
||||
pub fn pop(input, _) {
|
||||
case string.pop_grapheme(input) {
|
||||
Ok(#(char, tail)) -> {
|
||||
let assert [codepoint] = string.to_utf_codepoints(char)
|
||||
let i = string.utf_codepoint_to_int(codepoint)
|
||||
case i {
|
||||
_ if i >= 0x41 && i <= 0x5A -> pop(tail, char)
|
||||
_ if i >= 0x61 && i <= 0x7A -> pop(tail, char)
|
||||
_ -> Nil
|
||||
}
|
||||
}
|
||||
Error(_) -> Nil
|
||||
}
|
||||
}
|
||||
|
||||
pub fn pop2(input, _) {
|
||||
case input {
|
||||
"a" as j <> tail
|
||||
| "b" as j <> tail
|
||||
| "c" as j <> tail
|
||||
| "d" as j <> tail
|
||||
| "e" as j <> tail
|
||||
| "f" as j <> tail
|
||||
| "g" as j <> tail
|
||||
| "h" as j <> tail
|
||||
| "i" as j <> tail
|
||||
| "j" as j <> tail
|
||||
| "k" as j <> tail
|
||||
| "l" as j <> tail
|
||||
| "m" as j <> tail
|
||||
| "n" as j <> tail
|
||||
| "o" as j <> tail
|
||||
| "p" as j <> tail
|
||||
| "q" as j <> tail
|
||||
| "r" as j <> tail
|
||||
| "s" as j <> tail
|
||||
| "t" as j <> tail
|
||||
| "u" as j <> tail
|
||||
| "v" as j <> tail
|
||||
| "w" as j <> tail
|
||||
| "x" as j <> tail
|
||||
| "y" as j <> tail
|
||||
| "z" as j <> tail
|
||||
| "A" as j <> tail
|
||||
| "B" as j <> tail
|
||||
| "C" as j <> tail
|
||||
| "D" as j <> tail
|
||||
| "E" as j <> tail
|
||||
| "F" as j <> tail
|
||||
| "G" as j <> tail
|
||||
| "H" as j <> tail
|
||||
| "I" as j <> tail
|
||||
| "J" as j <> tail
|
||||
| "K" as j <> tail
|
||||
| "L" as j <> tail
|
||||
| "M" as j <> tail
|
||||
| "N" as j <> tail
|
||||
| "O" as j <> tail
|
||||
| "P" as j <> tail
|
||||
| "Q" as j <> tail
|
||||
| "R" as j <> tail
|
||||
| "S" as j <> tail
|
||||
| "T" as j <> tail
|
||||
| "U" as j <> tail
|
||||
| "V" as j <> tail
|
||||
| "W" as j <> tail
|
||||
| "X" as j <> tail
|
||||
| "Y" as j <> tail
|
||||
| "Z" as j <> tail -> pop2(tail, j)
|
||||
_ -> Nil
|
||||
}
|
||||
}
|
||||
|
||||
pub fn pop3(input, _) {
|
||||
case input {
|
||||
"a" <> tail
|
||||
| "b" <> tail
|
||||
| "c" <> tail
|
||||
| "d" <> tail
|
||||
| "e" <> tail
|
||||
| "f" <> tail
|
||||
| "g" <> tail
|
||||
| "h" <> tail
|
||||
| "i" <> tail
|
||||
| "j" <> tail
|
||||
| "k" <> tail
|
||||
| "l" <> tail
|
||||
| "m" <> tail
|
||||
| "n" <> tail
|
||||
| "o" <> tail
|
||||
| "p" <> tail
|
||||
| "q" <> tail
|
||||
| "r" <> tail
|
||||
| "s" <> tail
|
||||
| "t" <> tail
|
||||
| "u" <> tail
|
||||
| "v" <> tail
|
||||
| "w" <> tail
|
||||
| "x" <> tail
|
||||
| "y" <> tail
|
||||
| "z" <> tail
|
||||
| "A" <> tail
|
||||
| "B" <> tail
|
||||
| "C" <> tail
|
||||
| "D" <> tail
|
||||
| "E" <> tail
|
||||
| "F" <> tail
|
||||
| "G" <> tail
|
||||
| "H" <> tail
|
||||
| "I" <> tail
|
||||
| "J" <> tail
|
||||
| "K" <> tail
|
||||
| "L" <> tail
|
||||
| "M" <> tail
|
||||
| "N" <> tail
|
||||
| "O" <> tail
|
||||
| "P" <> tail
|
||||
| "Q" <> tail
|
||||
| "R" <> tail
|
||||
| "S" <> tail
|
||||
| "T" <> tail
|
||||
| "U" <> tail
|
||||
| "V" <> tail
|
||||
| "W" <> tail
|
||||
| "X" <> tail
|
||||
| "Y" <> tail
|
||||
| "Z" <> tail -> pop3(tail, "")
|
||||
_ -> Nil
|
||||
}
|
||||
}
|
||||
|
||||
pub fn pop4(input, _) {
|
||||
case string.pop_grapheme(input) {
|
||||
Ok(#(char, tail)) -> {
|
||||
case char {
|
||||
"a"
|
||||
| "b"
|
||||
| "c"
|
||||
| "d"
|
||||
| "e"
|
||||
| "f"
|
||||
| "g"
|
||||
| "h"
|
||||
| "i"
|
||||
| "j"
|
||||
| "k"
|
||||
| "l"
|
||||
| "m"
|
||||
| "n"
|
||||
| "o"
|
||||
| "p"
|
||||
| "q"
|
||||
| "r"
|
||||
| "s"
|
||||
| "t"
|
||||
| "u"
|
||||
| "v"
|
||||
| "w"
|
||||
| "x"
|
||||
| "y"
|
||||
| "z"
|
||||
| "A"
|
||||
| "B"
|
||||
| "C"
|
||||
| "D"
|
||||
| "E"
|
||||
| "F"
|
||||
| "G"
|
||||
| "H"
|
||||
| "I"
|
||||
| "J"
|
||||
| "K"
|
||||
| "L"
|
||||
| "M"
|
||||
| "N"
|
||||
| "O"
|
||||
| "P"
|
||||
| "Q"
|
||||
| "R"
|
||||
| "S"
|
||||
| "T"
|
||||
| "U"
|
||||
| "V"
|
||||
| "W"
|
||||
| "X"
|
||||
| "Y"
|
||||
| "Z" -> pop4(tail, char)
|
||||
_ -> Nil
|
||||
}
|
||||
}
|
||||
Error(_) -> Nil
|
||||
}
|
||||
}
|
||||
|
||||
pub fn pop5(input, _) {
|
||||
case string.pop_grapheme(input) {
|
||||
Ok(#("a" as char, tail))
|
||||
| Ok(#("b" as char, tail))
|
||||
| Ok(#("c" as char, tail))
|
||||
| Ok(#("d" as char, tail))
|
||||
| Ok(#("e" as char, tail))
|
||||
| Ok(#("f" as char, tail))
|
||||
| Ok(#("g" as char, tail))
|
||||
| Ok(#("h" as char, tail))
|
||||
| Ok(#("i" as char, tail))
|
||||
| Ok(#("j" as char, tail))
|
||||
| Ok(#("k" as char, tail))
|
||||
| Ok(#("l" as char, tail))
|
||||
| Ok(#("m" as char, tail))
|
||||
| Ok(#("n" as char, tail))
|
||||
| Ok(#("o" as char, tail))
|
||||
| Ok(#("p" as char, tail))
|
||||
| Ok(#("q" as char, tail))
|
||||
| Ok(#("r" as char, tail))
|
||||
| Ok(#("s" as char, tail))
|
||||
| Ok(#("t" as char, tail))
|
||||
| Ok(#("u" as char, tail))
|
||||
| Ok(#("v" as char, tail))
|
||||
| Ok(#("w" as char, tail))
|
||||
| Ok(#("x" as char, tail))
|
||||
| Ok(#("y" as char, tail))
|
||||
| Ok(#("z" as char, tail))
|
||||
| Ok(#("A" as char, tail))
|
||||
| Ok(#("B" as char, tail))
|
||||
| Ok(#("C" as char, tail))
|
||||
| Ok(#("D" as char, tail))
|
||||
| Ok(#("E" as char, tail))
|
||||
| Ok(#("F" as char, tail))
|
||||
| Ok(#("G" as char, tail))
|
||||
| Ok(#("H" as char, tail))
|
||||
| Ok(#("I" as char, tail))
|
||||
| Ok(#("J" as char, tail))
|
||||
| Ok(#("K" as char, tail))
|
||||
| Ok(#("L" as char, tail))
|
||||
| Ok(#("M" as char, tail))
|
||||
| Ok(#("N" as char, tail))
|
||||
| Ok(#("O" as char, tail))
|
||||
| Ok(#("P" as char, tail))
|
||||
| Ok(#("Q" as char, tail))
|
||||
| Ok(#("R" as char, tail))
|
||||
| Ok(#("S" as char, tail))
|
||||
| Ok(#("T" as char, tail))
|
||||
| Ok(#("U" as char, tail))
|
||||
| Ok(#("V" as char, tail))
|
||||
| Ok(#("W" as char, tail))
|
||||
| Ok(#("X" as char, tail))
|
||||
| Ok(#("Y" as char, tail))
|
||||
| Ok(#("Z" as char, tail)) -> pop4(tail, char)
|
||||
_ -> Nil
|
||||
}
|
||||
}
|
||||
|
||||
16
test/benchmark.js
Normal file
16
test/benchmark.js
Normal file
@@ -0,0 +1,16 @@
|
||||
import { run, bench, boxplot, summary } from "mitata";
|
||||
import { parse } from "../build/dev/javascript/gluri/gluri.mjs";
|
||||
import { parse as parse2 } from "../build/dev/javascript/gleam_stdlib/gleam/uri.mjs";
|
||||
|
||||
bench("parse", () =>
|
||||
parse(
|
||||
"https://test_name:user%20$$$@github.com/gleam-lang/stdlib/issues/523#issuecomment-3288230480",
|
||||
),
|
||||
);
|
||||
bench("parse2", () =>
|
||||
parse2(
|
||||
"https://test_name:user%20$$$@github.com/gleam-lang/stdlib/issues/523#issuecomment-3288230480",
|
||||
),
|
||||
);
|
||||
|
||||
await run();
|
||||
@@ -9,6 +9,66 @@ pub fn main() {
|
||||
startest.run(startest.default_config())
|
||||
}
|
||||
|
||||
pub fn parse_general_tests() {
|
||||
describe("general parsing", [
|
||||
it("mailto parsing", fn() {
|
||||
uri.parse("mailto:Joe@example.com")
|
||||
|> should.equal(Ok(
|
||||
Uri(..empty, scheme: Some("mailto"), path: "Joe@example.com"),
|
||||
))
|
||||
uri.parse("mailto:Joe@example.com?hello#bye")
|
||||
|> should.equal(Ok(
|
||||
Uri(
|
||||
..empty,
|
||||
scheme: Some("mailto"),
|
||||
path: "Joe@example.com",
|
||||
query: Some("hello"),
|
||||
fragment: Some("bye"),
|
||||
),
|
||||
))
|
||||
}),
|
||||
it("ai gen pass", fn() {
|
||||
let _ = uri.parse("https://example.com") |> should.be_ok
|
||||
let _ =
|
||||
uri.parse("http://www.example.org/resource?id=123&lang=en")
|
||||
|> should.be_ok
|
||||
let _ =
|
||||
uri.parse("ftp://ftp.example.net/pub/files/archive.tar.gz")
|
||||
|> should.be_ok
|
||||
let _ = uri.parse("mailto:user+alias@example.com") |> should.be_ok
|
||||
let _ = uri.parse("urn:isbn:978-3-16-148410-0") |> should.be_ok
|
||||
let _ =
|
||||
uri.parse("ws://socket.example.com:8080/chat?room=42#section2")
|
||||
|> should.be_ok
|
||||
let _ =
|
||||
uri.parse("https://sub.domain.co.uk/path/to/resource/") |> should.be_ok
|
||||
let _ =
|
||||
uri.parse("file:///C:/Windows/System32/drivers/etc/hosts")
|
||||
|> should.be_ok
|
||||
let _ =
|
||||
uri.parse("git+ssh://git@example.com:2222/repo.git") |> should.be_ok
|
||||
let _ =
|
||||
uri.parse(
|
||||
"https://xn--fsqu00a.xn--0zwm56d/%E8%B7%AF%E5%BE%84?%E6%9F%A5%E8%AF%A2=%E5%80%BC#%E7%89%87%E6%AE%B5",
|
||||
)
|
||||
|> should.be_ok
|
||||
Nil
|
||||
}),
|
||||
it("ai gen fail", fn() {
|
||||
let _ = uri.parse("ht!tp://example.com") |> should.be_error
|
||||
let _ = uri.parse("http://exa mple.com") |> should.be_error
|
||||
let _ = uri.parse("://missing-scheme.com") |> should.be_error
|
||||
let _ = uri.parse("http://example.com:80a/") |> should.be_error
|
||||
let _ = uri.parse("http://[2001:db8::1") |> should.be_error
|
||||
let _ = uri.parse("http://example.com/%ZZ") |> should.be_error
|
||||
let _ = uri.parse("http://example.com?%") |> should.be_error
|
||||
let _ = uri.parse("`https://example.com/invalid") |> should.be_error
|
||||
let _ = uri.parse("http://example.com?foo=bar%2") |> should.be_error
|
||||
let _ = uri.parse("http://example.com:12345abc/") |> should.be_error
|
||||
}),
|
||||
])
|
||||
}
|
||||
|
||||
pub fn parse_scheme_tests() {
|
||||
describe("scheme parsing", [
|
||||
it("simple parse", fn() {
|
||||
|
||||
Reference in New Issue
Block a user