release 8.25.22004

mo_parsing/enhancement.py

@@ -501,6 +501,14 @@ def __init__(self, expr, include=False, ignore=None, fail_on=None, engine_=None)
     def min_length(self):
         return 0
 
+    def __regex__(self):
+        prec, pattern = self.expr.__regex__()
+        pattern = regex_iso(prec, pattern, "+")
+        if self.parser_config.include:
+            return "*", f"(.*?{pattern})"
+        else:
+            return "+", f"(.*?){pattern}"
+
     def parse_impl(self, string, start, do_actions=True):
         instrlen = len(string)
         fail = self.parser_config.fail

mo_parsing/whitespaces.py

@@ -109,7 +109,7 @@ def set_whitespace(self, chars):
         self.white_chars = "".join(sorted(set(chars)))
         self.content = None
         self.expr = None if isinstance(Empty, Expecting) else Empty()
-        self.regex = re.compile(self.__regex__()[1])
+        self.regex = re.compile(self.__regex__()[1], re.DOTALL)
 
     def add_ignore(self, *ignore_exprs):
         """
@@ -122,7 +122,7 @@ def add_ignore(self, *ignore_exprs):
             self.ignore_list.append(ignore_expr)
             self.content = None
             self.expr = None if isinstance(Empty, Expecting) else Empty()
-            self.regex = re.compile(self.__regex__()[1])
+            self.regex = re.compile(self.__regex__()[1], re.DOTALL)
             return self
 
     def backup(self):

setup.py

@@ -15,5 +15,5 @@
     name='mo-parsing',
     packages=["mo_parsing"],
     url='https://github.com/klahnakoski/mo-parsing',
-    version='8.24.21357'
+    version='8.25.22004'
 )

setuptools.json

@@ -175,5 +175,5 @@
     "name": "mo-parsing",
     "packages": ["mo_parsing"],
     "url": "https://github.com/klahnakoski/mo-parsing",
-    "version": "8.24.21357"
+    "version": "8.25.22004"
 }

tests/test_regex.py

@@ -1,9 +1,10 @@
 # encoding: utf-8
 import re
 
-from mo_parsing import Regex, Char, LookAhead
-from mo_parsing.tokens import SingleCharLiteral
-from tests.test_simple_unit import PyparsingExpressionTestCase
+from mo_parsing import Regex, Char, LookAhead, Whitespace
+from mo_parsing.debug import Debugger
+from mo_parsing.tokens import SingleCharLiteral, Literal, Keyword
+from tests.test_simple_unit import PyparsingExpressionTestCase, SkipTo
 
 
 class TestRegexParsing(PyparsingExpressionTestCase):
@@ -230,3 +231,16 @@ def test_make_complex_ident(self):
             raise Exception("expecting parse error")
         except Exception:
             pass
+
+    def test_comment(self):
+        with Whitespace() as white:
+            white.add_ignore(Literal("/*") + SkipTo("*/", include=True))
+            parser = Keyword("select")+Keyword("true")
+            parser = parser.finalize()
+
+        result = parser.parse_string('/* \nfoo\n\n */\nselect true')
+
+        self.assertEqual(
+            list(result),
+            ["select", "true"]
+        )