X-Git-Url: https://git.draconx.ca/gitweb/cdecl99.git/blobdiff_plain/a197b2248cec667627f35db93acc689c2ddb821d..debaed3750c42accb4c63378a06f5cdc9cd8be3d:/src/typemap.c?ds=sidebyside
diff --git a/src/typemap.c b/src/typemap.c
index 599d2ca..a280be2 100644
--- a/src/typemap.c
+++ b/src/typemap.c
@@ -1,5 +1,24 @@
+/*
+ * Helpers for dealing with type specifiers.
+ * Copyright © 2011 Nick Bowler
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see .
+ */
+#include
#include
#include
+#include
#include "cdecl.h"
#include "typemap.h"
@@ -10,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<type)) {
+ if (map & spec_bit(s->type)) {
fprintf(stderr, "duplicate type specifier\n");
return -1;
}
- return map | (1ul<type);
+ return map | spec_bit(s->type);
}
unsigned long cdecl__build_typemap(struct cdecl_declspec *s)
@@ -60,13 +81,3 @@ unsigned long cdecl__build_typemap(struct cdecl_declspec *s)
return -1;
}
}
-
-const char *cdecl__explain_typemap(unsigned long map)
-{
- switch (map) {
-# include "typenames.h"
- default:
- fprintf(stderr, "invalid type specifiers\n");
- return NULL;
- }
-}