Index: libcfa/prototypes.awk =================================================================== --- libcfa/prototypes.awk (revision 2c2242c773dd4781ea54f277dace24b26fca305e) +++ libcfa/prototypes.awk (revision 2c2242c773dd4781ea54f277dace24b26fca305e) @@ -0,0 +1,107 @@ +BEGIN { + FS = "(" + types[0] = "UINTMAX"; vtypes[0] = "unsigned long int" + types[1] = "UINT16"; vtypes[1] = "short int" + types[2] = "UINT32"; vtypes[2] = "int" + types[3] = "UINT64"; vtypes[3] = "long long int" + types[4] = "UINT"; vtypes[4] = "unsigned int" + types[5] = "INTMAX"; vtypes[5] = "long int" + types[6] = "INTPTR"; vtypes[6] = "int *" + types[7] = "WINT"; vtypes[7] = "unsigned int" + types[8] = "INT"; vtypes[8] = "int" + types[9] = "ULONGLONG"; vtypes[9] = "unsigned long long" + types[10] = "ULONG"; vtypes[10] = "unsigned long" + types[11] = "UNSIGNED"; vtypes[11] = "unsigned" + types[12] = "COMPLEX_LONGDOUBLE"; vtypes[12] = "_Complex long double" + types[13] = "COMPLEX_DOUBLE"; vtypes[13] = "_Complex double" + types[14] = "COMPLEX_FLOAT"; vtypes[14] = "_Complex float" + types[15] = "LONGDOUBLEPTR"; vtypes[15] = "long double *" + types[16] = "LONGDOUBLE"; vtypes[16] = "long double" + types[17] = "LONGLONG"; vtypes[17] = "long long" + types[18] = "LONG"; vtypes[18] = "long" + types[19] = "DFLOAT32"; vtypes[19] = "_Decimal32" + types[20] = "DFLOAT64"; vtypes[20] = "_Decimal64" + types[21] = "DFLOAT128"; vtypes[21] = "_Decimal128" + types[22] = "DOUBLEPTR"; vtypes[22] = "double *" + types[23] = "DOUBLE"; vtypes[23] = "double" + types[24] = "FLOATPTR"; vtypes[24] = "float *" + types[25] = "FLOAT"; vtypes[25] = "float" + types[26] = "CONST_PTR"; vtypes[26] = "const void *" + types[27] = "CONST_STRING"; vtypes[27] = "const char *" + types[28] = "PTR_FN_VOID_VAR_PTR_SIZE"; vtypes[28] = "" + types[29] = "PTR_CONST_STRING"; vtypes[29] = "char *const" + types[30] = "PTRMODE_PTR"; vtypes[30] = "" + types[31] = "PTRPTR"; vtypes[31] = "void **" + types[32] = "PTR"; vtypes[32] = "void *" + types[33] = "VOID"; vtypes[33] = "void" + types[34] = "STRING"; vtypes[34] = "char *" + types[35] = "FILEPTR"; vtypes[35] = "struct _IO_FILE *" + types[36] = "SIZE"; vtypes[36] = "unsigned long" + types[37] = "VAR"; vtypes[37] = "..." + types[38] = "VALIST_ARG"; vtypes[38] = "void **" + types[39] = "VALIST_REF"; vtypes[39] = "void **" + types[40] = "UNWINDWORD"; vtypes[40] = "void *" + types[41] = "WORD"; vtypes[41] = "" + types[42] = "SSIZE"; vtypes[42] = "long int" + types[43] = "PID"; vtypes[43] = "int" + N = 44 +} + +/^BT_/ { prototypes[$1] = $1 } + +END { + printf( "#define DEF_BUILTIN(ENUM, NAME, CLASS, TYPE, LIBTYPE, BOTH_P, FALLBACK_P, NONANSI_P, ATTRS, IMPLICIT, COND) TYPE(NAME)\n" ); + printf( "#define FUNC_SIMPLE(RETURN, NAME, ARGS...) RETURN NAME(ARGS);\n" ); + printf( "#define BT_LAST(NAME) FUNC_SIMPLE(void, NAME)\n\n" ); + + for ( i = 0; i < N; i += 1 ) { + printf( "#define BT_%s %s\n", types[i], vtypes[i] ) + } + printf( "\n" ) + + for ( prototype in prototypes ) { + if ( index( "BT_LAST", prototype ) == 1 ) { + continue + } + printf( "#define %s(NAME) FUNC_SIMPLE(", prototype ) + + if ( sub( "BT_FN_", "", prototype) == 0 ) + if ( sub( "BT_", "", prototype) == 0 ) { + printf( "\n********** BAD MACRO NAME **********\n" ) + exit 0 + } + for ( t = 0; t < N; t += 1 ) { + type = types[t]; + if ( index( prototype, type ) == 1 ) { + printf( "BT_%s, NAME", type ) + sub( type, "", prototype) + break; + } + } + if ( index( prototype, "VAR" ) != 2 ) { + for ( p = 0; length( prototype ) > 0; p += 1 ) { + sub( "_", "", prototype) + printf( ", ", type ) + temp = prototype + for ( t = 0; t < N; t += 1 ) { + type = types[t]; + if ( index( prototype, type ) == 1 ) { + printf( "BT_%s", type ) + sub( type, "", prototype) + break; + } # if + } # for + if ( temp == prototype ) { + printf( "\n********** MISSING TYPE **********\n" ) + exit 0 + } # if + } # for + } # if + printf( ")\n" ) + } + + printf( "\n#include \"builtins.def\"\n\n" ); + printf( "typedef void ** __builtin_va_list;\n" ); + printf( "extern const char *__PRETTY_FUNCTION__;\n" ); + printf( "typedef int wchar_t;\n" ); +} Index: libcfa/prototypes.c =================================================================== --- libcfa/prototypes.c (revision 2c2242c773dd4781ea54f277dace24b26fca305e) +++ libcfa/prototypes.c (revision 2c2242c773dd4781ea54f277dace24b26fca305e) @@ -0,0 +1,2 @@ +#define DEF_BUILTIN(ENUM, NAME, CLASS, TYPE, LIBTYPE, BOTH_P, FALLBACK_P, NONANSI_P, ATTRS, IMPLICIT, COND) TYPE(NAME) +#include "builtins.def" Index: translator/Parser/lex.l =================================================================== --- translator/Parser/lex.l (revision fe3b61b34f1a1132bababba6acdcb718cd7ae7ef) +++ translator/Parser/lex.l (revision 2c2242c773dd4781ea54f277dace24b26fca305e) @@ -10,6 +10,6 @@ * Created On : Sat Sep 22 08:58:10 2001 * Last Modified By : Peter A. Buhr - * Last Modified On : Sat Jan 17 09:15:03 2015 - * Update Count : 318 + * Last Modified On : Wed Jan 21 08:43:59 2015 + * Update Count : 320 */ @@ -216,4 +216,5 @@ finally { KEYWORD_RETURN(FINALLY); } // CFA float { KEYWORD_RETURN(FLOAT); } +__float128 { KEYWORD_RETURN(FLOAT); } // GCC for { KEYWORD_RETURN(FOR); } forall { KEYWORD_RETURN(FORALL); } // CFA @@ -230,4 +231,5 @@ __inline__ { KEYWORD_RETURN(INLINE); } // GCC int { KEYWORD_RETURN(INT); } +__int128 { KEYWORD_RETURN(INT); } // GCC __label__ { KEYWORD_RETURN(LABEL); } // GCC long { KEYWORD_RETURN(LONG); } Index: translator/ResolvExpr/Resolver.cc =================================================================== --- translator/ResolvExpr/Resolver.cc (revision fe3b61b34f1a1132bababba6acdcb718cd7ae7ef) +++ translator/ResolvExpr/Resolver.cc (revision 2c2242c773dd4781ea54f277dace24b26fca305e) @@ -257,9 +257,37 @@ std::list::iterator iter1( baseStruct->get_members().begin() ); std::list::iterator iter2( listInit->begin_initializers() ); - for ( ; iter1 != baseStruct->get_members().end() && iter2 != listInit->end_initializers() ; ++iter1, ++iter2 ) { - DeclarationWithType *dt = dynamic_cast( *iter1 ); - initContext = dt->get_type(); - (*iter2)->accept( *this ); - } + for ( ; iter1 != baseStruct->get_members().end() && iter2 != listInit->end_initializers(); ++iter2 ) { + if ( (*iter2)->get_designators().empty() ) { + DeclarationWithType *dt = dynamic_cast( *iter1 ); + initContext = dt->get_type(); + (*iter2)->accept( *this ); + ++iter1; + } else { + StructDecl *st = baseStruct; + iter1 = st->get_members().begin(); + std::list::iterator iter3( (*iter2)->get_designators().begin() ); + for ( ; iter3 != (*iter2)->get_designators().end(); ++iter3 ) { + NameExpr *key = dynamic_cast( *iter3 ); + assert( key ); + for ( ; iter1 != st->get_members().end(); ++iter1 ) { + if ( key->get_name() == (*iter1)->get_name() ) { + (*iter1)->print( cout ); + cout << key->get_name() << endl; + ObjectDecl *fred = dynamic_cast( *iter1 ); + assert( fred ); + StructInstType *mary = dynamic_cast( fred->get_type() ); + assert( mary ); + st = mary->get_baseStruct(); + iter1 = st->get_members().begin(); + break; + } // if + } // for + } // for + ObjectDecl *fred = dynamic_cast( *iter1 ); + assert( fred ); + initContext = fred->get_type(); + (*listInit->begin_initializers())->accept( *this ); + } // if + } // for } else if ( UnionInstType *st = dynamic_cast(initContext) ) { DeclarationWithType *dt = dynamic_cast( *st->get_baseUnion()->get_members().begin() );