X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ca6beef439aae0d4d7ba02af5a60435623d3e4f..a30eb8d63c2291f6b50b935cecf16139b372f9f2:/src/gras/DataDesc/ddt_parse.c diff --git a/src/gras/DataDesc/ddt_parse.c b/src/gras/DataDesc/ddt_parse.c index c60dcc015d..193c6f125b 100644 --- a/src/gras/DataDesc/ddt_parse.c +++ b/src/gras/DataDesc/ddt_parse.c @@ -11,6 +11,7 @@ #include /* isdigit */ +#include "xbt/ex.h" #include "gras/DataDesc/datadesc_private.h" #include "gras/DataDesc/ddt_parse.yy.h" @@ -111,11 +112,16 @@ static void change_to_fixed_array(xbt_dynar_t dynar, long int size) { XBT_IN; xbt_dynar_pop(dynar,&former); - array.type_name=(char*)xbt_malloc(strlen(former.type->name)+20); + array.type_name=(char*)xbt_malloc(strlen(former.type->name)+48); DEBUG2("Array specification (size=%ld, elm='%s'), change pushed type", size,former.type_name); - sprintf(array.type_name,"%s[%ld]",former.type_name,size); - xbt_free(former.type_name); + sprintf(array.type_name,"%s%s%s%s[%ld]", + (former.tm.is_unsigned?"u ":""), + (former.tm.is_short?"s ":""), + (former.tm.is_long?"l ":""), + former.type_name, + size); + free(former.type_name); array.type = gras_datadesc_array_fixed(array.type_name, former.type, size); /* redeclaration are ignored */ array.name = former.name; @@ -132,7 +138,7 @@ static void change_to_ref(xbt_dynar_t dynar) { ref.type_name=(char*)xbt_malloc(strlen(former.type->name)+2); DEBUG1("Ref specification (elm='%s'), change pushed type", former.type_name); sprintf(ref.type_name,"%s*",former.type_name); - xbt_free(former.type_name); + free(former.type_name); ref.type = gras_datadesc_ref(ref.type_name, former.type); /* redeclaration are ignored */ ref.name = former.name; @@ -151,15 +157,15 @@ static void change_to_ref_pop_array(xbt_dynar_t dynar) { ref.type_name = (char*)strdup(ref.type->name); ref.name = former.name; - xbt_free(former.type_name); + free(former.type_name); xbt_dynar_push(dynar,&ref); XBT_OUT; } -static xbt_error_t parse_statement(char *definition, - xbt_dynar_t identifiers, - xbt_dynar_t fields_to_push) { +static void parse_statement(char *definition, + xbt_dynar_t identifiers, + xbt_dynar_t fields_to_push) { char buffname[512]; s_identifier_t identifier; @@ -172,7 +178,7 @@ static xbt_error_t parse_statement(char *definition, gras_ddt_parse_tok_num = gras_ddt_parse_lex_n_dump(); if(gras_ddt_parse_tok_num == GRAS_DDT_PARSE_TOKEN_RA) { XBT_OUT; - return mismatch_error; /* end of the englobing structure or union */ + THROW0(mismatch_error,0,"End of the englobing structure or union"); } if (XBT_LOG_ISENABLED(ddt_parse,xbt_log_priority_debug)) { @@ -247,7 +253,7 @@ static xbt_error_t parse_statement(char *definition, identifier.type = gras_datadesc_by_name("unsigned char"); } else { /* impossible, gcc parses this shit before us */ - RAISE_IMPOSSIBLE; + THROW_IMPOSSIBLE; } } else if (!strcmp(identifier.type_name, "float")) { @@ -352,28 +358,26 @@ static xbt_error_t parse_statement(char *definition, while ( (gras_ddt_parse_tok_num = gras_ddt_parse_lex_n_dump()) == GRAS_DDT_PARSE_TOKEN_EMPTY ); + /* get the value */ + if (gras_ddt_parse_tok_num != GRAS_DDT_PARSE_TOKEN_WORD) PARSE_ERROR1("Unparsable annotation: Expected key value, got '%s'",gras_ddt_parse_text); keyval = (char*)strdup(gras_ddt_parse_text); while ( (gras_ddt_parse_tok_num = gras_ddt_parse_lex_n_dump()) == GRAS_DDT_PARSE_TOKEN_EMPTY ); - if (gras_ddt_parse_tok_num != GRAS_DDT_PARSE_TOKEN_RP) - PARSE_ERROR1("Unparsable annotation: Expected parenthesis, got '%s'",gras_ddt_parse_text); - /* Done with parsing the annotation. Now deal with it by replacing previously pushed type with the right one */ DEBUG2("Anotation: %s=%s",keyname,keyval); if (!strcmp(keyname,"size")) { - xbt_free(keyname); + free(keyname); if (!identifier.tm.is_ref) PARSE_ERROR0("Size annotation for a field not being a reference"); identifier.tm.is_ref--; if (!strcmp(keyval,"1")) { change_to_ref(identifiers); - xbt_free(keyval); - continue; + free(keyval); } else { char *p; int fixed = 1; @@ -383,20 +387,40 @@ static xbt_error_t parse_statement(char *definition, if (fixed) { change_to_fixed_array(identifiers,atoi(keyval)); change_to_ref(identifiers); - xbt_free(keyval); - continue; + free(keyval); } else { change_to_ref_pop_array(identifiers); xbt_dynar_push(fields_to_push,&keyval); - continue; } } - RAISE_IMPOSSIBLE; - } else { PARSE_ERROR1("Unknown annotation type: '%s'",keyname); } + + /* Get all the multipliers */ + while (gras_ddt_parse_tok_num == GRAS_DDT_PARSE_TOKEN_STAR) { + + gras_ddt_parse_tok_num = gras_ddt_parse_lex_n_dump(); + + if (gras_ddt_parse_tok_num != GRAS_DDT_PARSE_TOKEN_WORD) + PARSE_ERROR1("Unparsable annotation: Expected field name after '*', got '%s'",gras_ddt_parse_text); + + keyval = xbt_malloc(strlen(gras_ddt_parse_text)+2); + sprintf(keyval,"*%s",gras_ddt_parse_text); + + /* ask caller to push field as a multiplier */ + xbt_dynar_push(fields_to_push,&keyval); + + /* skip blanks after this block*/ + while ( (gras_ddt_parse_tok_num = gras_ddt_parse_lex_n_dump()) + == GRAS_DDT_PARSE_TOKEN_EMPTY ); + } + + if (gras_ddt_parse_tok_num != GRAS_DDT_PARSE_TOKEN_RP) + PARSE_ERROR1("Unparsable annotation: Expected parenthesis, got '%s'", + gras_ddt_parse_text); + continue; /* End of annotation handling */ @@ -428,18 +452,19 @@ static xbt_error_t parse_statement(char *definition, } XBT_OUT; - return no_error; } static gras_datadesc_type_t parse_struct(char *definition) { - xbt_error_t errcode; + xbt_ex_t e; + char buffname[32]; static int anonymous_struct=0; xbt_dynar_t identifiers; s_identifier_t field; int i; + int done; xbt_dynar_t fields_to_push; char *name; @@ -466,9 +491,16 @@ static gras_datadesc_type_t parse_struct(char *definition) { gras_ddt_parse_text); /* Parse the identifiers */ - for (errcode=parse_statement(definition,identifiers,fields_to_push); - errcode == no_error ; - errcode=parse_statement(definition,identifiers,fields_to_push)) { + done = 0; + do { + TRY { + parse_statement(definition,identifiers,fields_to_push); + } CATCH(e) { + if (e.category != mismatch_error) + RETHROW; + xbt_ex_free(&e); + done = 1; + } DEBUG1("This statement contained %lu identifiers",xbt_dynar_length(identifiers)); /* append the identifiers we've found */ @@ -479,8 +511,8 @@ static gras_datadesc_type_t parse_struct(char *definition) { VERB2("Append field '%s' to %p",field.name, (void*)struct_type); gras_datadesc_struct_append(struct_type, field.name, field.type); - xbt_free(field.name); - xbt_free(field.type_name); + free(field.name); + free(field.type_name); } xbt_dynar_reset(identifiers); @@ -489,17 +521,20 @@ static gras_datadesc_type_t parse_struct(char *definition) { /* Make sure that all fields declaring a size push it into the cbps */ xbt_dynar_foreach(fields_to_push,i, name) { DEBUG1("struct_type=%p",(void*)struct_type); - VERB2("Push field '%s' into size stack of %p", name, (void*)struct_type); - gras_datadesc_cb_field_push(struct_type, name); - xbt_free(name); + if (name[0] == '*') { + VERB2("Push field '%s' as a multiplier into size stack of %p", + name+1, (void*)struct_type); + gras_datadesc_cb_field_push_multiplier(struct_type, name+1); + } else { + VERB2("Push field '%s' into size stack of %p", + name, (void*)struct_type); + gras_datadesc_cb_field_push(struct_type, name); + } + free(name); } xbt_dynar_reset(fields_to_push); - } + } while (!done); gras_datadesc_struct_close(struct_type); - if (errcode != mismatch_error) { - XBT_OUT; - return NULL; /* FIXME: LEAK! */ - } /* terminates */ if (gras_ddt_parse_tok_num != GRAS_DDT_PARSE_TOKEN_RA) @@ -599,7 +634,7 @@ gras_datadesc_parse(const char *name, gras_ddt_parse_pointer_string_close(); VERB0("end of _gras_ddt_type_parse()"); - xbt_free(definition); + free(definition); /* register it under the name provided as symbol */ if (strcmp(res->name,name)) { ERROR2("In GRAS_DEFINE_TYPE, the provided symbol (here %s) must be the C type name (here %s)", @@ -610,5 +645,3 @@ gras_datadesc_parse(const char *name, XBT_OUT; return res; } - -