type: Make an assert()ion independent of the last entry of an enum.

[cparser] / type.c

diff --git a/type.c b/type.c
index 1dee248..5a71c31 100644 (file)
--- a/type.c
+++ b/type.c
@@ -1,21 +1,6 @@
 /*
  * This file is part of cparser.
- * Copyright (C) 2007-2009 Matthias Braun <matze@braunis.de>
- *
- * 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 2
- * 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, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
+ * Copyright (C) 2012 Matthias Braun <matze@braunis.de>
  */
 #include <config.h>
 
@@ -65,8 +50,7 @@ static size_t get_type_struct_size(type_kind_t kind)
                [TYPE_TYPEDEF]         = sizeof(typedef_type_t),
                [TYPE_TYPEOF]          = sizeof(typeof_type_t),
        };
-       assert(lengthof(sizes) == (int)TYPE_TYPEOF + 1);
-       assert(kind <= TYPE_TYPEOF);
+       assert((size_t)kind < lengthof(sizes));
        assert(sizes[kind] != 0);
        return sizes[kind];
 }
@@ -259,7 +243,7 @@ void print_type_qualifiers(type_qualifiers_t const qualifiers, QualifierSeparato
 
 const char *get_atomic_kind_name(atomic_type_kind_t kind)
 {
-       switch(kind) {
+       switch (kind) {
        case ATOMIC_TYPE_VOID:        return "void";
        case ATOMIC_TYPE_WCHAR_T:     return "wchar_t";
        case ATOMIC_TYPE_BOOL:        return c_mode & _CXX ? "bool" : "_Bool";
@@ -379,7 +363,7 @@ static void print_function_type_post(const function_type_t *type,
        separator_t sep = { "", ", " };
        if (parameters == NULL) {
                function_parameter_t *parameter = type->parameters;
-               for( ; parameter != NULL; parameter = parameter->next) {
+               for ( ; parameter != NULL; parameter = parameter->next) {
                        print_string(sep_next(&sep));
                        print_type(parameter->type);
                }
@@ -508,7 +492,7 @@ void print_enum_definition(const enum_t *enume)
        change_indent(1);
 
        entity_t *entry = enume->base.next;
-       for( ; entry != NULL && entry->kind == ENTITY_ENUM_VALUE;
+       for ( ; entry != NULL && entry->kind == ENTITY_ENUM_VALUE;
               entry = entry->base.next) {
 
                print_indent();
@@ -550,7 +534,7 @@ void print_compound_definition(const compound_t *compound)
        change_indent(1);
 
        entity_t *entity = compound->members.entities;
-       for( ; entity != NULL; entity = entity->base.next) {
+       for ( ; entity != NULL; entity = entity->base.next) {
                if (entity->kind != ENTITY_COMPOUND_MEMBER)
                        continue;
 
@@ -621,7 +605,7 @@ static void print_typeof_type_pre(const typeof_type_t *const type)
  */
 static void intern_print_type_pre(const type_t *const type)
 {
-       switch(type->kind) {
+       switch (type->kind) {
        case TYPE_ARRAY:           print_array_type_pre(          &type->array);     return;
        case TYPE_ATOMIC:          print_atomic_type(             &type->atomic);    return;
        case TYPE_COMPLEX:         print_complex_type(            &type->atomic);    return;
@@ -646,7 +630,7 @@ static void intern_print_type_pre(const type_t *const type)
  */
 static void intern_print_type_post(const type_t *const type)
 {
-       switch(type->kind) {
+       switch (type->kind) {
        case TYPE_FUNCTION:
                print_function_type_post(&type->function, NULL);
                return;
@@ -753,12 +737,8 @@ static bool test_atomic_type_flag(atomic_type_kind_t kind,
 bool is_type_integer(const type_t *type)
 {
        assert(!is_typeref(type));
-
-       if (type->kind == TYPE_ENUM)
-               return true;
-       if (type->kind != TYPE_ATOMIC)
+       if (!is_type_arithmetic(type))
                return false;
-
        return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_INTEGER);
 }
 
@@ -778,16 +758,17 @@ bool is_type_float(const type_t *type)
        return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_FLOAT);
 }
 
-bool is_type_signed(const type_t *type)
+bool is_type_complex(const type_t *type)
 {
        assert(!is_typeref(type));
+       return type->kind == TYPE_COMPLEX;
+}
 
-       /* enum types are int for now */
-       if (type->kind == TYPE_ENUM)
-               return true;
-       if (type->kind != TYPE_ATOMIC)
+bool is_type_signed(const type_t *type)
+{
+       assert(!is_typeref(type));
+       if (!is_type_arithmetic(type))
                return false;
-
        return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_SIGNED);
 }
 
@@ -795,7 +776,7 @@ bool is_type_arithmetic(const type_t *type)
 {
        assert(!is_typeref(type));
 
-       switch(type->kind) {
+       switch (type->kind) {
        case TYPE_ENUM:
                return true;
        case TYPE_ATOMIC:
@@ -817,11 +798,12 @@ bool is_type_scalar(const type_t *type)
 {
        assert(!is_typeref(type));
 
-       switch(type->kind) {
+       switch (type->kind) {
        case TYPE_POINTER:
        case TYPE_ENUM:
                return true;
        case TYPE_ATOMIC:
+       case TYPE_COMPLEX:
        case TYPE_IMAGINARY:
                return test_atomic_type_flag(type->atomic.akind, ATOMIC_TYPE_FLAG_ARITHMETIC);
        default:
@@ -833,7 +815,7 @@ bool is_type_incomplete(const type_t *type)
 {
        assert(!is_typeref(type));
 
-       switch(type->kind) {
+       switch (type->kind) {
        case TYPE_COMPOUND_STRUCT:
        case TYPE_COMPOUND_UNION: {
                const compound_type_t *compound_type = &type->compound;
@@ -1135,7 +1117,7 @@ static unsigned get_type_alignment_compound(type_t *const type)
 
 decl_modifiers_t get_type_modifiers(const type_t *type)
 {
-       switch(type->kind) {
+       switch (type->kind) {
        case TYPE_ERROR:
                break;
        case TYPE_COMPOUND_STRUCT: