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]+'.

diff --git a/ChangeLog b/ChangeLog
index eb3d8acd68983e7a29994dcce1e1d42ab279f57b..553533499b850a64284462e02919aedf01203bca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2024-04-11  Collin Funk  <collin.funk1@gmail.com>
+
+       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  <bruno@clisp.org>
 
        users.txt: Correct some entries.

diff --git a/pygnulib/GLEmiter.py b/pygnulib/GLEmiter.py
index 6d82657e7c11b444d3f9e468d4f9ef65230e79b0..ad164515dc6f6f720f79a86201beeb487255596e 100644 (file)
--- 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_')