Merge pull request #52 from sirosen/expose-flags

Add support for passing flags as strings

Author: Julian

regress.pyi

@@ -2,8 +2,10 @@ from __future__ import annotations
 
 from typing import Iterable
 
+class RegressError(Exception): ...
+
 class Regex:
-    def __init__(self, pattern: str): ...
+    def __init__(self, pattern: str, flags: str | None = None): ...
     def find(self, text: str) -> Match | None: ...
     def find_iter(self, text: str) -> Iterable[Match] | None: ...
 

src/lib.rs

@@ -12,10 +12,17 @@ struct RegexPy {
 #[pymethods]
 impl RegexPy {
     #[new]
-    fn init(value: &str) -> PyResult<Self> {
-        match Regex::new(value) {
-            Ok(inner) => Ok(RegexPy { inner }),
-            Err(e) => Err(RegressError::new_err(e.to_string())),
+    #[pyo3(signature = (value, flags=None))]
+    fn init(value: &str, flags: Option<&str>) -> PyResult<Self> {
+        match flags {
+            Some(f) => match Regex::with_flags(value, f) {
+                Ok(inner) => Ok(RegexPy { inner }),
+                Err(e) => Err(RegressError::new_err(e.to_string())),
+            },
+            None => match Regex::new(value) {
+                Ok(inner) => Ok(RegexPy { inner }),
+                Err(e) => Err(RegressError::new_err(e.to_string())),
+            },
         }
     }
 

tests/test_regress.py

@@ -60,3 +60,16 @@ def test_error_handling():
         pass
     else:
         pytest.fail("error not reached")
+
+
+def test_with_flags():
+    # "L" for letters, "Z" for spaces, "N" for numerics
+    pattern = r"^\p{L}\p{Z}\p{N}$"
+
+    regex = regress.Regex(pattern, flags="u")
+    flagless_regex = regress.Regex(pattern)
+
+    match = regex.find("a 0")
+    flagless_match = flagless_regex.find("a 0")
+    assert match is not None
+    assert flagless_match is None