Patchwork [4,of,6,V2] match: extract function that group regexps

login
register
mail settings
Submitter Boris Feld
Date Nov. 22, 2018, 10:17 p.m.
Message ID <4628c3cf1fc1052ca252.1542925041@localhost.localdomain>
Download mbox | patch
Permalink /patch/36725/
State Superseded
Headers show

Comments

Boris Feld - Nov. 22, 2018, 10:17 p.m.
# HG changeset patch
# User Boris Feld <boris.feld@octobus.net>
# Date 1542903949 -3600
#      Thu Nov 22 17:25:49 2018 +0100
# Node ID 4628c3cf1fc1052ca25296c8c1a42c4502b59dc9
# Parent  b702174979d09090d5e5081d09755cbb74540ff0
# EXP-Topic perf-ignore-2
# Available At https://bitbucket.org/octobus/mercurial-devel/
#              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r 4628c3cf1fc1
match: extract function that group regexps
via Mercurial-devel - Nov. 23, 2018, 7:26 a.m.
On Thu, Nov 22, 2018 at 2:23 PM Boris Feld <boris.feld@octobus.net> wrote:

> # HG changeset patch
> # User Boris Feld <boris.feld@octobus.net>
> # Date 1542903949 -3600
> #      Thu Nov 22 17:25:49 2018 +0100
> # Node ID 4628c3cf1fc1052ca25296c8c1a42c4502b59dc9
> # Parent  b702174979d09090d5e5081d09755cbb74540ff0
> # EXP-Topic perf-ignore-2
> # Available At https://bitbucket.org/octobus/mercurial-devel/
> #              hg pull https://bitbucket.org/octobus/mercurial-devel/ -r
> 4628c3cf1fc1
> match: extract function that group regexps
>
> diff --git a/mercurial/match.py b/mercurial/match.py
> --- a/mercurial/match.py
> +++ b/mercurial/match.py
> @@ -1186,6 +1186,10 @@ def _buildmatch(kindpats, globsuffix, li
>
>  MAXRESIZE = 20000
>
> +def _groupregexps(regexps):
>

The name suggests to me that it produces a list of lists or something like
that, but it returns a single string. Something like "_joinregexps" seems
clearer (maybe also s/exps/exes/ to match existing function names and
variable names).


> +    """gather multiple regexps into a single one"""
> +    return '(?:%s)' % '|'.join(regexps)
> +
>  def _buildregexmatch(kindpats, globsuffix):
>      """Build a match function from a list of kinds and kindpats,
>      return regexp string and a matcher function.
> @@ -1199,8 +1203,8 @@ def _buildregexmatch(kindpats, globsuffi
>      OverflowError
>      """
>      try:
> -        regex = '(?:%s)' % '|'.join([_regex(k, p, globsuffix)
> -                                     for (k, p, s) in kindpats])
> +        regex = _groupregexps([_regex(k, p, globsuffix)
> +                               for (k, p, s) in kindpats])
>          if len(regex) > MAXRESIZE:
>              raise OverflowError
>          return regex, _rematcher(regex)
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>
Boris Feld - Nov. 28, 2018, 3:33 p.m.
On 23/11/2018 08:26, Martin von Zweigbergk via Mercurial-devel wrote:
>
>
> On Thu, Nov 22, 2018 at 2:23 PM Boris Feld <boris.feld@octobus.net
> <mailto:boris.feld@octobus.net>> wrote:
>
>     # HG changeset patch
>     # User Boris Feld <boris.feld@octobus.net
>     <mailto:boris.feld@octobus.net>>
>     # Date 1542903949 -3600
>     #      Thu Nov 22 17:25:49 2018 +0100
>     # Node ID 4628c3cf1fc1052ca25296c8c1a42c4502b59dc9
>     # Parent  b702174979d09090d5e5081d09755cbb74540ff0
>     # EXP-Topic perf-ignore-2
>     # Available At https://bitbucket.org/octobus/mercurial-devel/
>     #              hg pull
>     https://bitbucket.org/octobus/mercurial-devel/ -r 4628c3cf1fc1
>     match: extract function that group regexps
>
>     diff --git a/mercurial/match.py b/mercurial/match.py
>     --- a/mercurial/match.py
>     +++ b/mercurial/match.py
>     @@ -1186,6 +1186,10 @@ def _buildmatch(kindpats, globsuffix, li
>
>      MAXRESIZE = 20000
>
>     +def _groupregexps(regexps):
>
>
> The name suggests to me that it produces a list of lists or something
> like that, but it returns a single string. Something like
> "_joinregexps" seems clearer (maybe also s/exps/exes/ to match
> existing function names and variable names).
Good point, the name have been updated.
>  
>
>     +    """gather multiple regexps into a single one"""
>     +    return '(?:%s)' % '|'.join(regexps)
>     +
>      def _buildregexmatch(kindpats, globsuffix):
>          """Build a match function from a list of kinds and kindpats,
>          return regexp string and a matcher function.
>     @@ -1199,8 +1203,8 @@ def _buildregexmatch(kindpats, globsuffi
>          OverflowError
>          """
>          try:
>     -        regex = '(?:%s)' % '|'.join([_regex(k, p, globsuffix)
>     -                                     for (k, p, s) in kindpats])
>     +        regex = _groupregexps([_regex(k, p, globsuffix)
>     +                               for (k, p, s) in kindpats])
>              if len(regex) > MAXRESIZE:
>                  raise OverflowError
>              return regex, _rematcher(regex)
>     _______________________________________________
>     Mercurial-devel mailing list
>     Mercurial-devel@mercurial-scm.org
>     <mailto:Mercurial-devel@mercurial-scm.org>
>     https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
>
>
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel

Patch

diff --git a/mercurial/match.py b/mercurial/match.py
--- a/mercurial/match.py
+++ b/mercurial/match.py
@@ -1186,6 +1186,10 @@  def _buildmatch(kindpats, globsuffix, li
 
 MAXRESIZE = 20000
 
+def _groupregexps(regexps):
+    """gather multiple regexps into a single one"""
+    return '(?:%s)' % '|'.join(regexps)
+
 def _buildregexmatch(kindpats, globsuffix):
     """Build a match function from a list of kinds and kindpats,
     return regexp string and a matcher function.
@@ -1199,8 +1203,8 @@  def _buildregexmatch(kindpats, globsuffi
     OverflowError
     """
     try:
-        regex = '(?:%s)' % '|'.join([_regex(k, p, globsuffix)
-                                     for (k, p, s) in kindpats])
+        regex = _groupregexps([_regex(k, p, globsuffix)
+                               for (k, p, s) in kindpats])
         if len(regex) > MAXRESIZE:
             raise OverflowError
         return regex, _rematcher(regex)