From ba60c4437fda4f0c72194e11b46b048c6fee5783 Mon Sep 17 00:00:00 2001
From: Tobie Morgan Hitchcock <tobie@abcum.com>
Date: Sat, 22 May 2021 19:13:53 +0100
Subject: [PATCH] =?UTF-8?q?Improve=20regex=20parsing=20and=20allow=20?=
 =?UTF-8?q?=E2=80=98/=E2=80=98=20characters?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/sql/literal.rs |  1 +
 src/sql/regex.rs   | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/sql/literal.rs b/src/sql/literal.rs
index c3f5b79a..ef7c5525 100644
--- a/src/sql/literal.rs
+++ b/src/sql/literal.rs
@@ -471,6 +471,7 @@ pub fn literal(i: &str) -> IResult<&str, Literal> {
 		map(array, |v| Literal::Array(v)),
 		map(point, |v| Literal::Point(v)),
 		map(param, |v| Literal::Param(v)),
+		map(regex, |v| Literal::Regex(v)),
 		map(thing, |v| Literal::Thing(v)),
 		map(model, |v| Literal::Model(v)),
 		map(idiom, |v| Literal::Idiom(v)),
diff --git a/src/sql/regex.rs b/src/sql/regex.rs
index fcc9e7b9..61616ba0 100644
--- a/src/sql/regex.rs
+++ b/src/sql/regex.rs
@@ -1,6 +1,7 @@
+use nom::bytes::complete::escaped;
 use nom::bytes::complete::is_not;
 use nom::bytes::complete::tag;
-use nom::sequence::delimited;
+use nom::character::complete::one_of;
 use nom::IResult;
 use serde::{Deserialize, Serialize};
 use std::cmp::Ordering;
@@ -16,6 +17,8 @@ pub struct Regex {
 
 impl<'a> From<&'a str> for Regex {
 	fn from(r: &str) -> Regex {
+		let r = r.replace("\\/", "/");
+		let r = r.as_str();
 		Regex {
 			input: String::from(r),
 			value: match regex::Regex::new(r) {
@@ -46,7 +49,9 @@ impl fmt::Display for Regex {
 }
 
 pub fn regex(i: &str) -> IResult<&str, Regex> {
-	let (i, v) = delimited(tag("/"), is_not("/"), tag("/"))(i)?;
+	let (i, _) = tag("/")(i)?;
+	let (i, v) = escaped(is_not("\\/"), '\\', one_of("/"))(i)?;
+	let (i, _) = tag("/")(i)?;
 	Ok((i, Regex::from(v)))
 }
 
@@ -67,11 +72,11 @@ mod tests {
 
 	#[test]
 	fn regex_complex() {
-		let sql = "/test.*/";
+		let sql = r"/test\/[a-z]+\/.*/";
 		let res = regex(sql);
 		assert!(res.is_ok());
 		let out = res.unwrap().1;
-		assert_eq!("/test.*/", format!("{}", out));
-		assert_eq!(out, Regex::from("test.*"));
+		assert_eq!(r"/test/[a-z]+/.*/", format!("{}", out));
+		assert_eq!(out, Regex::from("test/[a-z]+/.*"));
 	}
 }