Fix detection of anonymous bit fields in a structure

madscientist · Nov 24, 2010 · ef6ccba · ef6ccba
1 parent bda365f
commit ef6ccba
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 8 deletions.
diff --git a/src/align.cpp b/src/align.cpp
@@ -1157,7 +1157,7 @@ static chunk_t *align_var_def_brace(chunk_t *start, int span, int *p_nl_count)
          }
          did_this_line = true;
       }
-      if (pc->type == CT_BIT_COLON)
+      else if (pc->type == CT_BIT_COLON)
       {
          if (!did_this_line)
          {

diff --git a/src/combine.cpp b/src/combine.cpp
@@ -1836,7 +1836,8 @@ void combine_labels(void)
             }
             else if (cur->type == CT_WORD)
             {
-               if (chunk_is_newline(prev))
+               tmp = chunk_get_next_nc(next, CNAV_PREPROC);
+               if (chunk_is_newline(prev) && ((tmp == NULL) || (tmp->type != CT_NUMBER)))
                {
                   cur->type  = CT_LABEL;
                   next->type = CT_LABEL_COLON;
@@ -1873,8 +1874,11 @@ void combine_labels(void)
             {
                /* ignore it, as it is inside a paren */
             }
-            else if ((cur->type == CT_TYPE) ||
-                     (cur->type == CT_ENUM) ||
+            else if (cur->type == CT_TYPE)
+            {
+               next->type = CT_BIT_COLON;
+            }
+            else if ((cur->type == CT_ENUM) ||
                      (cur->type == CT_PRIVATE) ||
                      (cur->type == CT_QUALIFIER) ||
                      (cur->parent_type == CT_ALIGN))

diff --git a/tests/input/c/align-var.c b/tests/input/c/align-var.c
@@ -10,13 +10,19 @@ struct foo2
  unsigned int a : 1;
  unsigned int bcd : 3;
  unsigned int ef : 2;
- unsigned int gh : 2;
+ unsigned int  : 2;
 
  unsigned short more;
 
  int fields;
 };
 
+typedef struct {
+bitfld a : 8;
+bitfld b : 16;
+bitfld : 8;
+} type_t;
+
 struct foo { int a; char *b };
 
 static   int idx;

diff --git a/tests/output/c/00402-align-var.c b/tests/output/c/00402-align-var.c
@@ -11,13 +11,20 @@ struct foo2
    unsigned int   a   : 1;
    unsigned int   bcd : 3;
    unsigned int   ef  : 2;
-   unsigned int   gh  : 2;
+   unsigned int       : 2;
 
    unsigned short more;
 
    int            fields;
 };
 
+typedef struct
+{
+   bitfld a : 8;
+   bitfld b : 16;
+   bitfld   : 8;
+} type_t;
+
 struct foo { int a; char *b };
 
 static int           idx;

diff --git a/tests/output/c/00403-align-var.c b/tests/output/c/00403-align-var.c
@@ -11,13 +11,20 @@ struct foo2
    unsigned int   a   : 1;
    unsigned int   bcd : 3;
    unsigned int   ef  : 2;
-   unsigned int   gh  : 2;
+   unsigned int       : 2;
 
    unsigned short more;
 
    int fields;
 };
 
+typedef struct
+{
+   bitfld a : 8;
+   bitfld b : 16;
+   bitfld   : 8;
+} type_t;
+
 struct foo { int a; char *b };
 
 static int           idx;

diff --git a/tests/output/c/00404-align-var.c b/tests/output/c/00404-align-var.c
@@ -11,13 +11,20 @@ struct foo2
    unsigned int a   : 1;
    unsigned int bcd : 3;
    unsigned int ef  : 2;
-   unsigned int gh  : 2;
+   unsigned int     : 2;
 
    unsigned short more;
 
    int fields;
 };
 
+typedef struct
+{
+   bitfld a : 8;
+   bitfld b : 16;
+   bitfld   : 8;
+} type_t;
+
 struct foo { int a; char *b };
 
 static int          idx;