Change "alphameric" to "alphanumeric".

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@274 2f5784b3-3f2a-0410-8824-cb99058d5e15

4 files changed, 13 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index eba06b2..33205d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,9 @@ Version 7.5 12-Nov-07
     This is actually not compatible with Perl, which accepts such patterns, but
     treats the conditional as always being FALSE (as PCRE used to), but it
     seems to me that giving a diagnostic is better.
+    
+8.  Change "alphameric" to the more common word "alphanumeric" in comments
+    and messages. 
 
 
 Version 7.4 21-Sep-07
diff --git a/pcre_compile.c b/pcre_compile.c
index 937853e..a39e584 100644
--- a/pcre_compile.c
+++ b/pcre_compile.c
@@ -498,16 +498,16 @@ ptr--;                            /* Set pointer back to the last byte */
 
 if (c == 0) *errorcodeptr = ERR1;
 
-/* Non-alphamerics are literals. For digits or letters, do an initial lookup in
-a table. A non-zero result is something that can be returned immediately.
+/* Non-alphanumerics are literals. For digits or letters, do an initial lookup
+in a table. A non-zero result is something that can be returned immediately.
 Otherwise further processing may be required. */
 
 #ifndef EBCDIC  /* ASCII coding */
-else if (c < '0' || c > 'z') {}                           /* Not alphameric */
+else if (c < '0' || c > 'z') {}                           /* Not alphanumeric */
 else if ((i = escapes[c - '0']) != 0) c = i;
 
 #else           /* EBCDIC coding */
-else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphameric */
+else if (c < 'a' || (ebcdic_chartab[c] & 0x0E) == 0) {}   /* Not alphanumeric */
 else if ((i = escapes[c - 0x48]) != 0)  c = i;
 #endif
 
@@ -724,10 +724,10 @@ else
     break;
 
     /* PCRE_EXTRA enables extensions to Perl in the matter of escapes. Any
-    other alphameric following \ is an error if PCRE_EXTRA was set; otherwise,
-    for Perl compatibility, it is a literal. This code looks a bit odd, but
-    there used to be some cases other than the default, and there may be again
-    in future, so I haven't "optimized" it. */
+    other alphanumeric following \ is an error if PCRE_EXTRA was set;
+    otherwise, for Perl compatibility, it is a literal. This code looks a bit
+    odd, but there used to be some cases other than the default, and there may
+    be again in future, so I haven't "optimized" it. */
 
     default:
     if ((options & PCRE_EXTRA) != 0) switch(c)
diff --git a/pcre_internal.h b/pcre_internal.h
index c72af6e..47a19a0 100644
--- a/pcre_internal.h
+++ b/pcre_internal.h
@@ -1037,7 +1037,7 @@ typedef struct dfa_match_data {
 #define ctype_letter  0x02
 #define ctype_digit   0x04
 #define ctype_xdigit  0x08
-#define ctype_word    0x10   /* alphameric or '_' */
+#define ctype_word    0x10   /* alphanumeric or '_' */
 #define ctype_meta    0x80   /* regexp meta char or zero (end pattern) */
 
 /* Offsets for the bitmap tables in pcre_cbits. Each table contains a set
diff --git a/pcretest.c b/pcretest.c
index a222146..3bfed06 100644
--- a/pcretest.c
+++ b/pcretest.c
@@ -1098,7 +1098,7 @@ while (!done)
 
   if (isalnum(delimiter) || delimiter == '\\')
     {
-    fprintf(outfile, "** Delimiter must not be alphameric or \\\n");
+    fprintf(outfile, "** Delimiter must not be alphanumeric or \\\n");
     goto SKIP_DATA;
     }