[gawk-diffs] [SCM] gawk branch, master, updated. bcbe7799ffc4b051e52eaf8f7f19ff844d4c7d20

[Arnold Robbins]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, master has been updated
       via  bcbe7799ffc4b051e52eaf8f7f19ff844d4c7d20 (commit)
      from  f467d127a7f09c4af97d4acfb0694e78b50751cb (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=bcbe7799ffc4b051e52eaf8f7f19ff844d4c7d20

commit bcbe7799ffc4b051e52eaf8f7f19ff844d4c7d20
Author: Arnold D. Robbins <address@hidden>
Date:   Mon Jun 20 20:30:35 2011 +0300

    Minor bug fixes, incl build system for pc, vms.

diff --git a/ChangeLog b/ChangeLog
index f3a5c83..5489cff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+Mon Jun 20 20:22:35 2011  Arnold D. Robbins  <address@hidden>
+
+       * dfa.c (setbit_c, setbit_case_fold_c): Compare btowc result against
+       WEOF. Thanks to Eli Zaretskii for pointing out the problem.
+
+Mon Jun 20 20:22:26 2011  Pat Rankin  <address@hidden>
+
+       * dfa.c (addtok_wc): enclose prototype within #if MBS_SUPPORT.
+
 Fri Jun 17 11:09:22 2011  Arnold D. Robbins  <address@hidden>
 
        * Release 3.1.86: Final beta test tar ball for 4.0.
diff --git a/NEWS b/NEWS
index 28f3062..0106f7c 100644
--- a/NEWS
+++ b/NEWS
@@ -71,7 +71,7 @@ Changes from 3.1.8 to 4.0.0
 
 24. The option for raw sockets was removed, since it was never implemented.
 
-25. Gawk not treats ranges of the form [d-h] as if they were in the C
+25. Gawk now treats ranges of the form [d-h] as if they were in the C
     locale, no matter what kind of regexp is being used, and even if
     --posix.  The latest POSIX standard allows this, and the documentation
     has been updated.  Maybe this will stop all the questions about
diff --git a/dfa.c b/dfa.c
index f155742..0c11054 100644
--- a/dfa.c
+++ b/dfa.c
@@ -582,7 +582,7 @@ static void
 setbit_c (int b, charclass c)
 {
   /* Do nothing if b is invalid in this character set.  */
-  if (MB_CUR_MAX > 1 && btowc (b) == EOF)
+  if (MB_CUR_MAX > 1 && btowc (b) == WEOF)
     return;
   setbit (b, c);
 }
@@ -601,7 +601,7 @@ setbit_case_fold_c (int b, charclass c)
   if (MB_CUR_MAX > 1)
     {
       wint_t wc = btowc (b);
-      if (wc == EOF)
+      if (wc == WEOF)
         return;
       setbit (b, c);
       if (case_fold && iswalpha (wc))
@@ -1451,7 +1451,9 @@ addtok_mb (token t, int mbprop)
     dfa->depth = depth;
 }
 
+#if MBS_SUPPORT
 static void addtok_wc (wint_t wc);
+#endif
 
 /* Add the given token to the parse tree, maintaining the depth count and
    updating the maximum depth if necessary. */
diff --git a/pc/ChangeLog b/pc/ChangeLog
index 7f6b710..919e855 100644
--- a/pc/ChangeLog
+++ b/pc/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 20 20:16:58 2011  Eli Zaretskii  <address@hidden>
+
+       * Makefile (LIBOBJS): Remove hard-locale$O.
+       (dfa$O): Remove hard-locale.h from prerequisites.
+
 Sun Jun  5 21:47:33 2011  Scott Deifik         <address@hidden>
 
        * Makefile.tst: Sync with mainline version.
diff --git a/pc/Makefile b/pc/Makefile
index a8c7c9b..403a86e 100644
--- a/pc/Makefile
+++ b/pc/Makefile
@@ -188,7 +188,7 @@ ALLOBJS = $(AWKOBJS) awkgram$O getid$O $(OBJ)
 
 # LIBOBJS
 #       GNU and other stuff that gawk uses as library routines.
-LIBOBJS= getopt$O getopt1$O dfa$O regex$O random$O hard-locale$O
+LIBOBJS= getopt$O getopt1$O dfa$O regex$O random$O
 
 GAWKOBJS = $(ALLOBJS) $(LIBOBJS)
 PGAWKOBJS = $(PAWKOBJS1) $(PAWKOBJS2) $(LIBOBJS) awkgram$O getid$O $(OBJ)
@@ -245,14 +245,12 @@ debug$O:  floatmagic.h
 
 command$O debug$O:     cmd.h
 
-dfa$O: hard-locale.h xalloc.h
+dfa$O: xalloc.h
 
 gawkmisc$O:    pc/gawkmisc.pc
 
 getopt$O getopt1$O :   getopt_int.h
 
-hard-locale$O: hard-locale.h
-
 io$O:          popen.h
 
 regex$O:       regcomp.c regexec.c regex_internal.h
diff --git a/posix/ChangeLog b/posix/ChangeLog
index fdc034a..eae49b3 100644
--- a/posix/ChangeLog
+++ b/posix/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 20 20:19:03 2011  Corinna Vinschen  <address@hidden>
+
+       * gawkmisc.c: Add include of <windows.h> for Cygwin to
+       remove a compiler warning.
+
 Mon May  2 23:38:06 2011  Corinna Vinschen  <address@hidden>
 
        * gawkmisc.c (cygwin_premain0): Use the real type for the secondnd
diff --git a/posix/gawkmisc.c b/posix/gawkmisc.c
index f4bbf66..acc3c9d 100644
--- a/posix/gawkmisc.c
+++ b/posix/gawkmisc.c
@@ -19,6 +19,7 @@
 
 #ifdef __CYGWIN__
 #include <stdio.h>
+#include <windows.h>
 #include <sys/cygwin.h>
 #include <io.h>
 #endif
diff --git a/vms/ChangeLog b/vms/ChangeLog
index 9cb0bf6..bfbf759 100644
--- a/vms/ChangeLog
+++ b/vms/ChangeLog
@@ -1,3 +1,8 @@
+Mon Jun 20 20:24:34 2011  Pat Rankin  <address@hidden>
+
+       * descrip.mms: Remove compilation of hard-locale.c.
+       * vmsbuild.com: Likewise.
+
 Tue May 31 23:10:35 2011  Arnold D. Robbins  <address@hidden>
 
        * vmstest.com (regrange): New test.
diff --git a/vms/descrip.mms b/vms/descrip.mms
index 6496a41..076b94b 100644
--- a/vms/descrip.mms
+++ b/vms/descrip.mms
@@ -104,7 +104,7 @@ PGAWKOBJ =  eval_p.obj,profile_p.obj
 DGAWKOBJ =  eval_d.obj,profile.obj,command.obj,debug.obj
 AWKOBJ1 =  array.obj,awkgram.obj,builtin.obj,dfa.obj,ext.obj,\
        field.obj,floatcomp.obj,gawkmisc.obj,getopt.obj,getopt1.obj,\
-       hard-locale.obj,io.obj
+       io.obj
 AWKOBJ2 = main.obj,msg.obj,node.obj,random.obj,re.obj,\
        regex.obj,replace.obj,version.obj
 AWKOBJS = $(AWKOBJ1),$(AWKOBJ2)
@@ -118,7 +118,7 @@ VMSOBJS = $(VMSCODE),$(VMSCMD)
 
 # primary source files
 AWKSRC = array.c,builtin.c,dfa.c,eval.c,eval_p.c,ext.c,field.c,\
-       floatcomp.c,gawkmisc.c,getopt.c,getopt1.c,hard-locale.c,io.c,main.c,\
+       floatcomp.c,gawkmisc.c,getopt.c,getopt1.c,io.c,main.c,\
        msg.c,node.c,profile.c,profile_p.c,random.c,re.c,regcomp.c,\
        regex.c,regex_internal.c,regexec.c,replace.c,version.c
 
@@ -223,8 +223,7 @@ $(DGAWKOBJ) : awk.h config.h $(VMSDIR)redirect.h
 random.obj     : random.h
 builtin.obj    : floatmagic.h random.h
 awkgram.obj    : awkgram.c awk.h
-dfa.obj        : dfa.c dfa.h hard-locale.h
-hard-locale.obj : hard-locale.c hard-locale.h
+dfa.obj        : dfa.c dfa.h
 regex.obj : regex.c regcomp.c regex_internal.c regexec.c regex.h 
regex_internal.h
 command.obj,debug.obj : cmd.h
 
diff --git a/vms/vmsbuild.com b/vms/vmsbuild.com
index 3e378e4..d3efc3b 100644
--- a/vms/vmsbuild.com
+++ b/vms/vmsbuild.com
@@ -79,7 +79,6 @@ $ cc floatcomp.c
 $ cc gawkmisc.c
 $ cc getopt.c
 $ cc getopt1.c
-$ cc hard-locale.c
 $ cc io.c
 $ cc main.c
 $ cc msg.c
@@ -109,7 +108,7 @@ $ close/noLog Fopt
 $ create gawk.opt
 ! GAWK -- GNU awk
 array.obj,awkgram.obj,builtin.obj,dfa.obj,ext.obj,field.obj,floatcomp.obj
-gawkmisc.obj,getopt.obj,getopt1.obj,hard-locale.obj,io.obj
+gawkmisc.obj,getopt.obj,getopt1.obj,io.obj
 main.obj,msg.obj,node.obj
 random.obj,re.obj,regex.obj,replace.obj,version.obj,eval.obj,profile.obj
 []vms_misc.obj,vms_popen.obj,vms_fwrite.obj,vms_args.obj
@@ -125,7 +124,7 @@ $!
 $ create pgawk.opt
 ! PGAWK -- GNU awk w/ run-time profiling
 array.obj,awkgram.obj,builtin.obj,dfa.obj,ext.obj,field.obj,floatcomp.obj
-gawkmisc.obj,getopt.obj,getopt1.obj,hard-locale.obj,io.obj
+gawkmisc.obj,getopt.obj,getopt1.obj,io.obj
 main.obj,msg.obj,node.obj
 random.obj,re.obj,regex.obj,replace.obj,version.obj,eval_p.obj,profile_p.obj
 []vms_misc.obj,vms_popen.obj,vms_fwrite.obj,vms_args.obj
@@ -141,7 +140,7 @@ $!
 $ create dgawk.opt
 ! DGAWK -- GNU awk w/ debugging
 array.obj,awkgram.obj,builtin.obj,dfa.obj,ext.obj,field.obj,floatcomp.obj
-gawkmisc.obj,getopt.obj,getopt1.obj,hard-locale.obj,io.obj
+gawkmisc.obj,getopt.obj,getopt1.obj,io.obj
 main.obj,msg.obj,node.obj
 random.obj,re.obj,regex.obj,replace.obj,version.obj
 eval_d.obj,profile.obj,command.obj,debug.obj

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog        |    9 +++++++++
 NEWS             |    2 +-
 dfa.c            |    6 ++++--
 pc/ChangeLog     |    5 +++++
 pc/Makefile      |    6 ++----
 posix/ChangeLog  |    5 +++++
 posix/gawkmisc.c |    1 +
 vms/ChangeLog    |    5 +++++
 vms/descrip.mms  |    7 +++----
 vms/vmsbuild.com |    7 +++----
 10 files changed, 38 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
gawk