#include <ctype.h> /* isdigit */
+#include "xbt/ex.h"
#include "gras/DataDesc/datadesc_private.h"
#include "gras/DataDesc/ddt_parse.yy.h"
XBT_OUT;
}
+static void print_type_modifier(s_type_modifier_t tm) __attribute__((unused));
static void print_type_modifier(s_type_modifier_t tm) {
int i;
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;
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;
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;
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 */
+ return old_mismatch_error; /* end of the englobing structure or union */
}
if (XBT_LOG_ISENABLED(ddt_parse,xbt_log_priority_debug)) {
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")) {
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);
+ free(keyval);
continue;
} else {
char *p;
if (fixed) {
change_to_fixed_array(identifiers,atoi(keyval));
change_to_ref(identifiers);
- xbt_free(keyval);
+ free(keyval);
continue;
} else {
continue;
}
}
- RAISE_IMPOSSIBLE;
+ THROW_IMPOSSIBLE;
} else {
PARSE_ERROR1("Unknown annotation type: '%s'",keyname);
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);
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);
+ free(name);
}
xbt_dynar_reset(fields_to_push);
}
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)",
XBT_OUT;
return res;
}
-
-