From 75861de277fcc1379fd413a97cd0f2628c48275c Mon Sep 17 00:00:00 2001 From: Collin Funk Date: Thu, 11 Apr 2024 11:00:47 -0700 Subject: [PATCH] gnulib-tool.py: Simplify regular expressions. * pygnulib/GLEmiter.py (GLEmiter.lib_Makefile_am) (GLEmiter.tests_Makefile_am): Change occurrences of '[A-Z][A-Z]*' to '[A-Z]+'. --- ChangeLog | 7 +++++++ pygnulib/GLEmiter.py | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index eb3d8acd68..553533499b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2024-04-11 Collin Funk + + gnulib-tool.py: Simplify regular expressions. + * pygnulib/GLEmiter.py (GLEmiter.lib_Makefile_am) + (GLEmiter.tests_Makefile_am): Change occurrences of '[A-Z][A-Z]*' to + '[A-Z]+'. + 2024-04-11 Bruno Haible users.txt: Correct some entries. diff --git a/pygnulib/GLEmiter.py b/pygnulib/GLEmiter.py index 6d82657e7c..ad164515dc 100644 --- a/pygnulib/GLEmiter.py +++ b/pygnulib/GLEmiter.py @@ -750,7 +750,7 @@ AC_DEFUN([%V1%_LIBSOURCES], [ # Replace NMD, so as to remove redundant "$(MKDIR_P) '.'" invocations. # The logic is similar to how we define gl_source_base_prefix. amsnippet1 = _eliminate_NMD(amsnippet1, automake_subdir) - pattern = re.compile(r'lib_([A-Z][A-Z]*)', re.M) + pattern = re.compile(r'lib_([A-Z]+)', re.M) amsnippet1 = pattern.sub(r'%s_%s_\1' % (libname, libext), amsnippet1) amsnippet1 = amsnippet1.replace('$(GNULIB_', '$(' + module_indicator_prefix + '_GNULIB_') @@ -768,7 +768,7 @@ AC_DEFUN([%V1%_LIBSOURCES], [ # Get unconditional snippet, edit it and save to amsnippet2. amsnippet2 = module.getAutomakeSnippet_Unconditional() - pattern = re.compile(r'lib_([A-Z][A-Z]*)', re.M) + pattern = re.compile(r'lib_([A-Z]+)', re.M) amsnippet2 = pattern.sub(r'%s_%s_\1' % (libname, libext), amsnippet2) amsnippet2 = amsnippet2.replace('$(GNULIB_', @@ -1045,7 +1045,7 @@ AC_DEFUN([%V1%_LIBSOURCES], [ # Replace NMD, so as to remove redundant "$(MKDIR_P) '.'" invocations. # The logic is similar to how we define gl_source_base_prefix. amsnippet1 = _eliminate_NMD(amsnippet1, False) - pattern = re.compile(r'lib_([A-Z][A-Z]*)', re.M) + pattern = re.compile(r'lib_([A-Z]+)', re.M) amsnippet1 = pattern.sub(r'libtests_a_\1', amsnippet1) amsnippet1 = amsnippet1.replace('$(GNULIB_', '$(' + module_indicator_prefix + '_GNULIB_') amsnippet1 = amsnippet1.replace('lib%_LIBRARIES', 'lib_LIBRARIES') @@ -1064,7 +1064,7 @@ AC_DEFUN([%V1%_LIBSOURCES], [ # Get unconditional snippet, edit it and save to amsnippet2. amsnippet2 = module.getAutomakeSnippet_Unconditional() - pattern = re.compile(r'lib_([A-Z][A-Z]*)', re.M) + pattern = re.compile(r'lib_([A-Z]+)', re.M) amsnippet2 = pattern.sub(r'libtests_a_\1', amsnippet2) amsnippet2 = amsnippet2.replace('$(GNULIB_', '$(' + module_indicator_prefix + '_GNULIB_') -- 2.39.5