From 5fcd1fef1cd724377a53a561972c8631d355585f Mon Sep 17 00:00:00 2001 From: grischka Date: Tue, 15 Jun 2010 17:02:09 +0200 Subject: [PATCH] Fix last commits: remove CRLF, chmod 644 tccgen.c --- tccgen.c | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) mode change 100755 => 100644 tccgen.c diff --git a/tccgen.c b/tccgen.c old mode 100755 new mode 100644 index a617d4c..5c5f26e --- a/tccgen.c +++ b/tccgen.c @@ -4824,7 +4824,7 @@ static void decl_initializer(CType *type, Section *sec, unsigned long c, /* patch type size if needed */ if (n < 0) s->c = array_length; - } else if ((type->t & VT_BTYPE) == VT_STRUCT && + } else if ((type->t & VT_BTYPE) == VT_STRUCT && (sec || !first || tok == '{')) { int par_count; @@ -4837,7 +4837,7 @@ static void decl_initializer(CType *type, Section *sec, unsigned long c, to do it correctly (ideally, the expression parser should be used in all cases) */ par_count = 0; - /* Coo: I think we must not deal '(' */ + /* Coo: I think we must not deal '(' */ if (tok == '(') { AttributeDef ad1; CType type1; @@ -4861,15 +4861,15 @@ static void decl_initializer(CType *type, Section *sec, unsigned long c, no_oblock = 0; } s = type->ref; - f = s->next; - /* Coo: skip empty struct */ - while (f->next && (f->type.t&VT_BTYPE)==VT_STRUCT && !f->type.ref->c) - f=f->next; + f = s->next; + /* Coo: skip empty struct */ + while (f->next && (f->type.t&VT_BTYPE)==VT_STRUCT && !f->type.ref->c) + f=f->next; array_length = 0; index = 0; n = s->c; while (tok != '}') { - int bit_pos; + int bit_pos; decl_designator(type, sec, c, NULL, &f, size_only); index = f->c; if (!size_only && array_length < index) { @@ -4880,25 +4880,25 @@ static void decl_initializer(CType *type, Section *sec, unsigned long c, if (index > array_length) array_length = index; - /* Coo: skip fields from same union */ - if (!(f->type.t&VT_BITFIELD)) - bit_pos=index*8; - else - bit_pos=f->c*8+((f->type.t>>VT_STRUCT_SHIFT)&0x3f)+((f->type.t>>(VT_STRUCT_SHIFT+6))&0x3f); - do - f=f->next; - while (f && (((f->type.t&VT_BTYPE)==VT_STRUCT && !f->type.ref->c) || - f->c*8+((f->type.t&VT_BITFIELD)?((f->type.t>>VT_STRUCT_SHIFT)&0x3f):0)type.t&VT_BITFIELD)) + bit_pos=index*8; + else + bit_pos=f->c*8+((f->type.t>>VT_STRUCT_SHIFT)&0x3f)+((f->type.t>>(VT_STRUCT_SHIFT+6))&0x3f); + do + f=f->next; + while (f && (((f->type.t&VT_BTYPE)==VT_STRUCT && !f->type.ref->c) || + f->c*8+((f->type.t&VT_BITFIELD)?((f->type.t>>VT_STRUCT_SHIFT)&0x3f):0)