Add raw_end and raw_start in Match class

rebulk/match.py

@@ -404,6 +404,8 @@ def __init__(self, start, end, value=None, name=None, tags=None, marker=None, pa
         self.pattern = pattern
         self.private = private
         self.children = []
+        self._raw_start = None
+        self._raw_end = None
 
     @property
     def span(self):
@@ -436,6 +438,46 @@ def value(self, value):
         """
         self._value = value  # pylint: disable=attribute-defined-outside-init
 
+    @property
+    def raw_start(self):
+        """
+        start index of raw value
+        :return:
+        :rtype:
+        """
+        if self._raw_start is None:
+            return self.start
+        return self._raw_start
+
+    @raw_start.setter
+    def raw_start(self, value):
+        """
+        Set start index of raw value
+        :return:
+        :rtype:
+        """
+        self._raw_start = value
+
+    @property
+    def raw_end(self):
+        """
+        end index of raw value
+        :return:
+        :rtype:
+        """
+        if self._raw_end is None:
+            return self.end
+        return self._raw_end
+
+    @raw_end.setter
+    def raw_end(self, value):
+        """
+        Set end index of raw value
+        :return:
+        :rtype:
+        """
+        self._raw_end = value
+
     @property
     def raw(self):
         """
@@ -444,7 +486,7 @@ def raw(self):
         :rtype:
         """
         if self.input_string:
-            return self.input_string[self.start:self.end]
+            return self.input_string[self.raw_start:self.raw_end]
         return None
 
     def crop(self, *crops, predicate=None, index=None):

rebulk/test/test_match.py

@@ -367,6 +367,26 @@ def test_filters(self):
         selection = matches.named("2-re", lambda m: "re" in m.tags, index=1000)
         assert selection is None
 
+    def test_raw(self):
+        input_string = "0123456789"
+
+        match = Match(0, 10, input_string=input_string, formatter=lambda s: s*2)
+
+        assert match.value == match.raw * 2
+        assert match.raw == input_string
+
+        match.raw_end = 9
+        match.raw_start = 1
+
+        assert match.value == match.raw * 2
+        assert match.raw == input_string[1:9]
+
+        match.raw_end = None
+        match.raw_start = None
+
+        assert match.value == match.raw * 2
+        assert match.raw == input_string
+
     def test_to_dict(self):
         input_string = "One Two Two Three"