Fixes for compliance to C89.

5 files changed, 50 insertions, 22 deletions

diff --git a/ChangeLog b/ChangeLog
index bd486f31..d80ad45a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,31 @@
 2009-11-17  Kaz Kylheku  <kkylheku@gmail.com>
 
+	Fixes for compliance to C89.
+
+	* lib.c (init): Do not define variable after statements.
+
+	* match.c (match_files): Likewise.
+
+	* regex.h (struct any_char_set, struct small_char_set, struct
+	displaced_char_set, struct large_char_set,
+	struct xlarge_char_set): do not use enum bitfields, which is a GCC
+	extension.
+
+	* unwind.h (enum uw_frtype, uw_frtype_t): Combine into one
+	declartion, eliminating forward enum reference which is a GCC
+	extension.
+	(uw_block_begin): Add dummy typedef to macro so that it requires
+	a following semicolon. Without this, if the macro use is followed
+	by a semicolon, that semicolon looks like a null statement. A
+	subsequent declaration thus follows a statement and is not conforming
+	to C89. Also added an opening do.
+	(uw_block_end): Add while(0) to match do in uw_block_begin.
+	(uw_env_begin, uw_env_end): Add do/while(0) to macro pair, so
+	uw_env_end reuqires a semicolon.
+	(uw_catch_begin, uw_catch_end): Likewise.
+
+2009-11-17  Kaz Kylheku  <kkylheku@gmail.com>
+
 	Version 022
 
 	Fix for bug 28033: crash in string output stream.
diff --git a/lib.c b/lib.c
index 258d63de..e119ed82 100644
--- a/lib.c
+++ b/lib.c
@@ -2023,8 +2023,9 @@ void obj_pprint(obj_t *obj, obj_t *out)
 void init(const wchar_t *pn, void *(*oom)(void *, size_t),
           obj_t **stack_bottom)
 {
+  int gc_save;
   progname = pn;
-  int gc_save = gc_state(0);
+  gc_save = gc_state(0);
 
   oom_realloc = oom;
   gc_init(stack_bottom);
diff --git a/match.c b/match.c
index ea028583..a205e126 100644
--- a/match.c
+++ b/match.c
@@ -1411,6 +1411,7 @@ repeat_spec_same_data:
         obj_t *new_style_dest = fourth(first_spec);
         obj_t *nt = nil;
         obj_t *dest;
+        fpip_t fp;
 
         if (old_style_dest) {
           dest = cat_str(subst_vars(old_style_dest, bindings), nil);
@@ -1431,7 +1432,7 @@ repeat_spec_same_data:
           }
         }
 
-        fpip_t fp = (errno = 0, complex_open(dest, t));
+        fp = (errno = 0, complex_open(dest, t));
 
         debugf(lit("opening data sink ~a"), dest, nao);
 
diff --git a/regex.h b/regex.h
index 19d19a7d..ecb86789 100644
--- a/regex.h
+++ b/regex.h
@@ -41,33 +41,33 @@ typedef cset_L1_t *cset_L2_t[16];
 typedef cset_L2_t *cset_L3_t[17];
 
 struct any_char_set {
-  chset_type_t type : 4;
-  int compl : 2;
+  unsigned type : 3;
+  unsigned compl : 1;
 };
 
 struct small_char_set {
-  chset_type_t type : 4;
-  int compl : 2;
+  unsigned type : 3;
+  unsigned compl : 1;
   cset_L0_t bitcell;
 };
 
 struct displaced_char_set {
-  chset_type_t type : 4;
-  int compl : 2;
+  unsigned type : 3;
+  unsigned compl : 1;
   cset_L0_t bitcell;
   wchar_t base;
 };
 
 
 struct large_char_set {
-  chset_type_t type : 4;
-  int inv : 2;
+  unsigned type : 3;
+  unsigned compl : 1;
   cset_L2_t dir;
 };
 
 struct xlarge_char_set {
-  chset_type_t type : 4;
-  int inv : 2;
+  unsigned type : 3;
+  unsigned compl : 1;
   cset_L3_t dir;
 };
 
diff --git a/unwind.h b/unwind.h
index 00931429..a212acba 100644
--- a/unwind.h
+++ b/unwind.h
@@ -31,9 +31,7 @@
 #endif
 
 typedef union uw_frame uw_frame_t;
-typedef enum uw_frtype uw_frtype_t;
-
-enum uw_frtype { UW_BLOCK, UW_ENV, UW_CATCH };
+typedef enum uw_frtype { UW_BLOCK, UW_ENV, UW_CATCH } uw_frtype_t;
 
 struct uw_common {
   uw_frame_t *up;
@@ -91,32 +89,34 @@ noreturn obj_t *type_mismatch(obj_t *, ...);
 
 #define uw_block_begin(TAG, RESULTVAR)  \
   obj_t *RESULTVAR = nil;               \
+  do                                    \
   {                                     \
     uw_frame_t uw_blk;                  \
     uw_push_block(&uw_blk, TAG);        \
     if (setjmp(uw_blk.bl.jb)) {         \
       RESULTVAR = uw_blk.bl.result;     \
-    } else  {
+    } else {                            \
+      typedef int uw_d_u_m_m_y
 
 #define uw_block_end                    \
     }                                   \
     uw_pop_frame(&uw_blk);              \
-  }
+  } while (0)
 
 #define uw_env_begin                    \
-  {                                     \
+  do {                                  \
     uw_frame_t uw_env;                  \
     uw_push_env(&uw_env)
 
 #define uw_env_end                      \
     uw_pop_frame(&uw_env);              \
-  }
+  } while (0)
 
 #define uw_catch_begin(MATCHES, SYMVAR, \
                        EXCVAR)          \
   obj_t *SYMVAR = nil;                  \
   obj_t *EXCVAR = nil;                  \
-  {                                     \
+  do {                                  \
     uw_frame_t uw_catch;                \
     uw_push_catch(&uw_catch, MATCHES);  \
     switch (setjmp(uw_catch.ca.jb)) {   \
@@ -129,7 +129,7 @@ noreturn obj_t *type_mismatch(obj_t *, ...);
       break;                            \
     case 2:                             \
       EXCVAR = uw_catch.ca.exception;   \
-      SYMVAR = uw_catch.ca.sym;         \
+      SYMVAR = uw_catch.ca.sym;
 
 #define uw_unwind                       \
       break;                            \
@@ -144,7 +144,7 @@ noreturn obj_t *type_mismatch(obj_t *, ...);
       uw_continue(&uw_catch,            \
                   uw_catch.ca.cont);    \
     uw_pop_frame(&uw_catch);            \
-  }
+  } while(0)
 
 #define internal_error(STR)             \
   do {                                  \