From 50740b7b9166ba57d289ad3bd2dc7a878fb20caf Mon Sep 17 00:00:00 2001 From: "byte[]" Date: Wed, 21 Aug 2019 21:53:44 -0400 Subject: [PATCH] more type work --- lib/philomena/search/lexer.ex | 112 ++++++++++++++++++++++++++++++++-- 1 file changed, 108 insertions(+), 4 deletions(-) diff --git a/lib/philomena/search/lexer.ex b/lib/philomena/search/lexer.ex index 55abc3ff..6e9c521b 100644 --- a/lib/philomena/search/lexer.ex +++ b/lib/philomena/search/lexer.ex @@ -29,6 +29,10 @@ defmodule Philomena.Search.Lexer do lparen = string("(") |> unwrap_and_tag(:lparen) rparen = string(")") |> unwrap_and_tag(:rparen) + space = + choice([string(" "), string("\t"), string("\n"), string("\r"), string("\v"), string("\f")]) + |> ignore() + number = optional(ascii_char('-+')) |> ascii_char([?0..?9]) @@ -36,13 +40,113 @@ defmodule Philomena.Search.Lexer do |> optional(ascii_char('.') |> ascii_char([?0..?9]) |> times(min: 1)) |> reduce(:to_number) + bool = + choice([ + string("true"), + string("false") + ]) + |> reduce({Jason, :decode!, []}) + + ipv4_octet = + ascii_string([?0..?9], min: 1, max: 3) + + ipv4_mask = + string("/") + |> ascii_string([?0..?9], min: 1, max: 2) + + ipv4_address = + concat(ipv4_octet, string(".")) + |> concat(ipv4_octet) + |> string(".") + |> concat(ipv4_octet) + |> string(".") + |> concat(ipv4_octet) + + ipv4_cidr = + concat(ipv4_address, optional(ipv4_mask)) + + ipv6_hexadectet = + ascii_string('0123456789abcdefABCDEF', min: 1, max: 4) + + ipv6_mask = + string("/") + |> ascii_string([?0..?9], min: 1, max: 3) + + ipv4_mapped_ipv6 = + string("::ffff:") + |> concat(ipv4_address) + + # ipv6_address = # todo + + year = integer(4) + month = integer(2) + day = integer(2) + + hour = integer(2) + minute = integer(2) + second = integer(2) + tz_hour = integer(2) + tz_minute = integer(2) + + ymd_sep = ignore(string("-")) + hms_sep = ignore(string(":")) + iso8601_sep = ignore(choice([string("T"), string("t"), space])) + iso8601_tzsep = choice([string("+"), string("-")]) + zulu = ignore(choice([string("Z"), string("z")])) + + """ + absolute_date = + year + |> optional( + concat(ymd_sep, month) + |> optional( + concat(ymd_sep, day) + |> optional( + concat(iso8601_sep, hour) + |> optional( + concat(hms_sep, minute) + |> optional( + concat(hms_sep, second) + ) + ) + ) + ) + ) + |> optional( + choice([ + concat(iso8601_tzsep, tz_hour) + |> optional( + concat(hms_sep, tz_minute) + ), + zulu + ]) + ) + """ + + relative_date = + integer(min: 1) + |> ignore(concat(space, empty())) + |> choice([ + string("second") |> optional(string("s")) |> replace(1), + string("minute") |> optional(string("s")) |> replace(60), + string("hour") |> optional(string("s")) |> replace(3600), + string("day") |> optional(string("s")) |> replace(86400), + string("week") |> optional(string("s")) |> replace(604800), + string("month") |> optional(string("s")) |> replace(2629746), + string("year") |> optional(string("s")) |> replace(31556952) + ]) + |> ignore(string(" ago")) + |> tag(:relative_date) + + date = + # choice([ + # absolute_date, + relative_date + # ]) + boost = ignore(string("^")) |> unwrap_and_tag(number, :boost) fuzz = ignore(string("~")) |> unwrap_and_tag(number, :fuzz) - space = - choice([string(" "), string("\t"), string("\n"), string("\r"), string("\v"), string("\f")]) - |> ignore() - quot = string("\"") quoted_term =