perf: Revert back to pattern matching for ranges
May need to do more in depth checks and optimisations may need to be removed if the core gleam compiler fixes the performance issues with pattern matching + capture. Possibly pattern matching may be better for smaller ranges but would need to do benchmarks to find out what the cut-off point is.
This commit is contained in:
		@@ -731,51 +731,55 @@ fn parse_unreserved(str: String) -> Result(#(String, String), Nil) {
 | 
				
			|||||||
//               / %2A / %2B / %2C / %3B / %3D
 | 
					//               / %2A / %2B / %2C / %3B / %3D
 | 
				
			||||||
fn parse_sub_delim(str: String) -> Result(#(String, String), Nil) {
 | 
					fn parse_sub_delim(str: String) -> Result(#(String, String), Nil) {
 | 
				
			||||||
  case string.pop_grapheme(str) {
 | 
					  case string.pop_grapheme(str) {
 | 
				
			||||||
    Ok(#(char, tail)) -> {
 | 
					    Ok(#("!" as char, tail))
 | 
				
			||||||
      let assert [codepoint] = string.to_utf_codepoints(char)
 | 
					    | Ok(#("$" as char, tail))
 | 
				
			||||||
      let i = string.utf_codepoint_to_int(codepoint)
 | 
					    | Ok(#("&" as char, tail))
 | 
				
			||||||
      case i {
 | 
					    | Ok(#("'" as char, tail))
 | 
				
			||||||
        _ if i >= 0x26 && i <= 0x2C -> Ok(#(char, tail))
 | 
					    | Ok(#("(" as char, tail))
 | 
				
			||||||
        _ if i == 0x21 -> Ok(#(char, tail))
 | 
					    | Ok(#(")" as char, tail))
 | 
				
			||||||
        _ if i == 0x24 -> Ok(#(char, tail))
 | 
					    | Ok(#("*" as char, tail))
 | 
				
			||||||
        _ if i == 0x3B -> Ok(#(char, tail))
 | 
					    | Ok(#("+" as char, tail))
 | 
				
			||||||
        _ if i == 0x3D -> Ok(#(char, tail))
 | 
					    | Ok(#("," as char, tail))
 | 
				
			||||||
 | 
					    | Ok(#(";" as char, tail))
 | 
				
			||||||
 | 
					    | Ok(#("=" as char, tail)) -> Ok(#(char, tail))
 | 
				
			||||||
    _ -> Error(Nil)
 | 
					    _ -> Error(Nil)
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
    Error(_) -> Error(Nil)
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
// DIGIT    = %x30–39
 | 
					// DIGIT    = %x30–39
 | 
				
			||||||
fn parse_digit(str: String) -> Result(#(String, String), Nil) {
 | 
					fn parse_digit(str: String) -> Result(#(String, String), Nil) {
 | 
				
			||||||
  case string.pop_grapheme(str) {
 | 
					  case string.pop_grapheme(str) {
 | 
				
			||||||
    Ok(#(char, tail)) -> {
 | 
					    Ok(#("0" as char, tail))
 | 
				
			||||||
      let assert [codepoint] = string.to_utf_codepoints(char)
 | 
					    | Ok(#("1" as char, tail))
 | 
				
			||||||
      let i = string.utf_codepoint_to_int(codepoint)
 | 
					    | Ok(#("2" as char, tail))
 | 
				
			||||||
      case i {
 | 
					    | Ok(#("3" as char, tail))
 | 
				
			||||||
        _ if i >= 0x30 && i <= 0x39 -> Ok(#(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)
 | 
					    _ -> Error(Nil)
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
    Error(_) -> Error(Nil)
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
// DIGIT (non-zero)    = %x31–39
 | 
					// DIGIT (non-zero)    = %x31–39
 | 
				
			||||||
fn parse_digit_nz(str: String) -> Result(#(String, String), Nil) {
 | 
					fn parse_digit_nz(str: String) -> Result(#(String, String), Nil) {
 | 
				
			||||||
  case string.pop_grapheme(str) {
 | 
					  case string.pop_grapheme(str) {
 | 
				
			||||||
    Ok(#(char, tail)) -> {
 | 
					    Ok(#("1" as char, tail))
 | 
				
			||||||
      let assert [codepoint] = string.to_utf_codepoints(char)
 | 
					    | Ok(#("2" as char, tail))
 | 
				
			||||||
      let i = string.utf_codepoint_to_int(codepoint)
 | 
					    | Ok(#("3" as char, tail))
 | 
				
			||||||
      case i {
 | 
					    | Ok(#("4" as char, tail))
 | 
				
			||||||
        _ if i >= 0x31 && i <= 0x39 -> Ok(#(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)
 | 
					    _ -> Error(Nil)
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
    Error(_) -> Error(Nil)
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
fn parse_digits(str: String, digits: String) {
 | 
					fn parse_digits(str: String, digits: String) {
 | 
				
			||||||
  case parse_digit(str) {
 | 
					  case parse_digit(str) {
 | 
				
			||||||
@@ -789,18 +793,62 @@ fn parse_digits(str: String, digits: String) {
 | 
				
			|||||||
// ALPHA    = %x41–5A | %x61–7A
 | 
					// ALPHA    = %x41–5A | %x61–7A
 | 
				
			||||||
fn parse_alpha(str: String) -> Result(#(String, String), Nil) {
 | 
					fn parse_alpha(str: String) -> Result(#(String, String), Nil) {
 | 
				
			||||||
  case string.pop_grapheme(str) {
 | 
					  case string.pop_grapheme(str) {
 | 
				
			||||||
    Ok(#(char, tail)) -> {
 | 
					    Ok(#("a" as char, tail))
 | 
				
			||||||
      let assert [codepoint] = string.to_utf_codepoints(char)
 | 
					    | Ok(#("b" as char, tail))
 | 
				
			||||||
      let i = string.utf_codepoint_to_int(codepoint)
 | 
					    | Ok(#("c" as char, tail))
 | 
				
			||||||
      case i {
 | 
					    | Ok(#("d" as char, tail))
 | 
				
			||||||
        _ if i >= 0x41 && i <= 0x5A -> Ok(#(char, tail))
 | 
					    | Ok(#("e" as char, tail))
 | 
				
			||||||
        _ if i >= 0x61 && i <= 0x7A -> Ok(#(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)
 | 
					    _ -> Error(Nil)
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
    Error(_) -> Error(Nil)
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
pub fn parse_query_parts(query: String) -> Result(List(#(String, String)), Nil) {
 | 
					pub fn parse_query_parts(query: String) -> Result(List(#(String, String)), Nil) {
 | 
				
			||||||
  let splitter = splitter.new(["&"])
 | 
					  let splitter = splitter.new(["&"])
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -372,19 +372,32 @@ fn unescape_percent(str: String) -> String {
 | 
				
			|||||||
 | 
					
 | 
				
			||||||
pub fn parse_hex_digit(str: String) -> Result(#(String, String), Nil) {
 | 
					pub fn parse_hex_digit(str: String) -> Result(#(String, String), Nil) {
 | 
				
			||||||
  case string.pop_grapheme(str) {
 | 
					  case string.pop_grapheme(str) {
 | 
				
			||||||
    Ok(#(char, tail)) -> {
 | 
					    Ok(#("0" as char, tail))
 | 
				
			||||||
      let assert [codepoint] = string.to_utf_codepoints(char)
 | 
					    | Ok(#("1" as char, tail))
 | 
				
			||||||
      let i = string.utf_codepoint_to_int(codepoint)
 | 
					    | Ok(#("2" as char, tail))
 | 
				
			||||||
      case i {
 | 
					    | Ok(#("3" as char, tail))
 | 
				
			||||||
        _ if i >= 0x30 && i <= 0x39 -> Ok(#(char, tail))
 | 
					    | Ok(#("4" as char, tail))
 | 
				
			||||||
        _ if i >= 0x41 && i <= 0x46 -> Ok(#(char, tail))
 | 
					    | Ok(#("5" as char, tail))
 | 
				
			||||||
        _ if i >= 0x61 && i <= 0x66 -> Ok(#(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)
 | 
					    _ -> Error(Nil)
 | 
				
			||||||
  }
 | 
					  }
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
    Error(_) -> Error(Nil)
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
pub fn parse_hex_digits(str, min, max) {
 | 
					pub fn parse_hex_digits(str, min, max) {
 | 
				
			||||||
  parse_min_max(str, min, max, parse_hex_digit)
 | 
					  parse_min_max(str, min, max, parse_hex_digit)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user