Rename regen'd hdr to reflect expanded capabilities

The recently added utf8_strings.h has been expanded to include more than
just strings.  I'm renaming it to avoid confusion.

diff --git a/MANIFEST b/MANIFEST
index 960b357..46f29a7 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -4919,7 +4919,7 @@ regen/regcharclass.pl             Generate regcharclass.h from inline data
 regen/regcomp.pl               Builder of regnodes.h
 regen/regen_lib.pl             Common file routines for generator scripts
 regen/uconfig_h.pl             generate uconfig.h (requires /bin/sh)
-regen/utf8_strings.pl          generate utf8_strings.h
+regen/unicode_constants.pl     generate unicode_constants.h
 regen/warnings.pl              Program to write warnings.h and lib/warnings.pm
 regexec.c                      Regular expression evaluator
 regexp.h                       Public declarations for the above
@@ -5555,11 +5555,11 @@ t/x2p/s2p.t                     See if s2p/psed work
 uconfig64.sh                   Configuration script for microperl for LP64
 uconfig.h                      Configuration header for microperl
 uconfig.sh                     Configuration script for microperl
+unicode_constants.h            compile-time macros for Unicode code points
 universal.c                    The default UNIVERSAL package methods
 unixish.h                      Defines that are assumed on Unix
 utf8.c                         Unicode routines
 utf8.h                         Unicode header
-utf8_strings.h                 compile-time macros for characters in UTF-8
 utfebcdic.h                    Unicode on EBCDIC (UTF-EBCDIC, tr16) header
 util.c                         Utility routines
 util.h                         Dummy header

diff --git a/regcomp.c b/regcomp.c
index a508ce2..10745e9 100644 (file)
--- a/regcomp.c
+++ b/regcomp.c
@@ -89,7 +89,7 @@ extern const struct regexp_engine my_reg_engine;
 #include "dquote_static.c"
 #include "charclass_invlists.h"
 #include "inline_invlist.c"
-#include "utf8_strings.h"
+#include "unicode_constants.h"
 
 #define HAS_NONLATIN1_FOLD_CLOSURE(i) _HAS_NONLATIN1_FOLD_CLOSURE_ONLY_FOR_USE_BY_REGCOMP_DOT_C_AND_REGEXEC_DOT_C(i)
 #define IS_NON_FINAL_FOLD(c) _IS_NON_FINAL_FOLD_ONLY_FOR_USE_BY_REGCOMP_DOT_C(c)

diff --git a/regen/utf8_strings.pl b/regen/unicode_constants.pl
similarity index 95%
rename from regen/utf8_strings.pl
rename to regen/unicode_constants.pl
index 311afac..73ec4ae 100644 (file)
--- a/regen/utf8_strings.pl
+++ b/regen/unicode_constants.pl
@@ -4,14 +4,14 @@ use warnings;
 require 'regen/regen_lib.pl';
 use charnames qw(:loose);
 
-my $out_fh = open_new('utf8_strings.h', '>',
+my $out_fh = open_new('unicode_constants.h', '>',
                      {style => '*', by => $0,
                       from => "Unicode data"});
 
 print $out_fh <<END;
 
-#ifndef H_UTF8_STRINGS   /* Guard against nested #includes */
-#define H_UTF8_STRINGS   1
+#ifndef H_UNICODE_CONSTANTS   /* Guard against nested #includes */
+#define H_UNICODE_CONSTANTS   1
 
 /* This file contains #defines for various Unicode code points.  The values
  * the macros expand to are the native Unicode code point, or all or portions
@@ -112,7 +112,7 @@ while ( <DATA> ) {
     print $out_fh "#define ${name}$suffix $str    /* U+$cp */\n";
 }
 
-print $out_fh "\n#endif /* H_UTF8_STRINGS */\n";
+print $out_fh "\n#endif /* H_UNICODE_CONSTANTS */\n";
 
 read_only_bottom_close_and_rename($out_fh);
 

diff --git a/regexec.c b/regexec.c
index 5ce6f28..f51d50d 100644 (file)
--- a/regexec.c
+++ b/regexec.c
@@ -81,7 +81,7 @@
 #endif
 
 #include "inline_invlist.c"
-#include "utf8_strings.h"
+#include "unicode_constants.h"
 
 #define RF_tainted     1       /* tainted information used? e.g. locale */
 #define RF_warned      2               /* warned about big count? */

diff --git a/utf8_strings.h b/unicode_constants.h
similarity index 90%
rename from utf8_strings.h
rename to unicode_constants.h
index 67a69c3..f915d59 100644 (file)
--- a/utf8_strings.h
+++ b/unicode_constants.h
@@ -1,12 +1,12 @@
 /* -*- buffer-read-only: t -*-
  * !!!!!!!   DO NOT EDIT THIS FILE   !!!!!!!
- * This file is built by regen/utf8_strings.pl from Unicode data.
+ * This file is built by regen/unicode_constants.pl from Unicode data.
  * Any changes made here will be lost!
  */
 
 
-#ifndef H_UTF8_STRINGS   /* Guard against nested #includes */
-#define H_UTF8_STRINGS   1
+#ifndef H_UNICODE_CONSTANTS   /* Guard against nested #includes */
+#define H_UNICODE_CONSTANTS   1
 
 /* This file contains #defines for various Unicode code points.  The values
  * the macros expand to are the native Unicode code point, or all or portions
@@ -43,6 +43,6 @@
 #define MICRO_SIGN_NATIVE 0x00B5    /* U+00B5 */
 #define NEXT_LINE_NATIVE 0x0085    /* U+0085 */
 
-#endif /* H_UTF8_STRINGS */
+#endif /* H_UNICODE_CONSTANTS */
 
 /* ex: set ro: */