Make CDECL_SPEC_TYPE non-zero.

[cdecl99.git] / src / typemap.c

diff --git a/src/typemap.c b/src/typemap.c
index b8965a1b05d816d680a2375c3099e1bbe305e30f..11048684dce7be71ba2f76b0317c82da3f1d0942 100644 (file)
--- a/src/typemap.c
+++ b/src/typemap.c
@@ -18,6 +18,7 @@
 #include <config.h>
 #include <stdio.h>
 #include <stdbool.h>
+#include <assert.h>
 #include "cdecl.h"
 #include "typemap.h"
 
@@ -28,30 +29,32 @@
  * 2 times.  Treat it as a special case, assigning an unused bit to represent
  * the second long.
  */
-#define CDECL_TYPE_LLONG 31
+#define CDECL_TYPE_LLONG (CDECL_SPEC_TYPE + 31)
+
+static inline unsigned long spec_bit(unsigned type)
+{
+       return 1ul << (type & (CDECL_SPEC_TYPE - 1));
+}
 
 static unsigned long add_typespec(unsigned long map, struct cdecl_declspec *s)
 {
-       if (s->type >= CDECL_TYPE_LLONG) {
-               fprintf(stderr, "invalid type specifier\n");
-               return -1;
-       }
+       assert(s->type >= CDECL_SPEC_TYPE && s->type < CDECL_TYPE_LLONG);
 
        if (s->type == CDECL_TYPE_LONG) {
-               if (map & (1ul<<CDECL_TYPE_LLONG)) {
+               if (map & spec_bit(CDECL_TYPE_LLONG)) {
                        fprintf(stderr, "too many long specifiers\n");
                        return -1;
-               } else if (map & (1ul<<CDECL_TYPE_LONG)) {
-                       return map | (1ul<<CDECL_TYPE_LLONG);
+               } else if (map & spec_bit(CDECL_TYPE_LONG)) {
+                       return map | spec_bit(CDECL_TYPE_LLONG);
                }
        }
 
-       if (map & (1ul<<s->type)) {
+       if (map & spec_bit(s->type)) {
                fprintf(stderr, "duplicate type specifier\n");
                return -1;
        }
 
-       return map | (1ul<<s->type);
+       return map | spec_bit(s->type);
 }
 
 unsigned long cdecl__build_typemap(struct cdecl_declspec *s)