# include "xmalloc.h"
# include "pto_debug.h"
+# include "gnu_ext.h"
/* Local Defines: */
# define obstack_chunk_alloc xmalloc
{
type *tp = get_entity_type (ent);
- if (is_primitive_type (tp) || is_pointer_type (tp)) {
+ if (is_Primitive_type (tp) || is_Pointer_type (tp)) {
/* actually, we don't get by by restricting ourselves to pointer types */
return (TRUE);
} else {
void *tmp;
if (NULL != get_type_link (clazz)) {
- DBGPRINT (3, (stdout, "collect_fields(): reusing field list for \"%s\"\n",
+ DBGPRINT (3, (stdout, "%s: reusing field list for \"%s\"\n",
+ __FUNCTION__,
get_type_name (clazz)));
return ((entity **) get_type_link (clazz));
} else {
- DBGPRINT (2, (stdout, "collect_fields(): new field list for \"%s\"\n",
+ DBGPRINT (2, (stdout, "%s: new field list for \"%s\"\n",
+ __FUNCTION__,
get_type_name (clazz)));
}
n_fields = obstack_object_size (&obst) / sizeof (void*);
- fields = NALLOC(n_fields * sizeof(*fields));
+ fields = NALLOC (n_fields * sizeof (entity*));
tmp = obstack_finish(&obst);
- memcpy (fields, tmp, n_fields * sizeof(*fields));
+ memcpy (fields, tmp, n_fields * sizeof (entity*));
obstack_free (&obst, NULL);
for (i = 0; i < obj_desc->n_fields; i ++) {
entity *field = obj_desc->fields [i];
- if (is_pointer_type (get_entity_type (field))) {
+ if (is_Pointer_type (get_entity_type (field))) {
const char *ent_name = get_entity_name (field);
fprintf (stream, "|<%i>%s", i, ent_name);
return (arr_desc->value);
} else {
assert (0 && "invalid descriptor");
- return NULL;
}
+ return NULL;
}
{
desc_t *desc = NULL;
- assert ((is_class_type (tp) || is_array_type (tp)) && "unsuitable type");
+ assert ((is_Class_type (tp) || is_Array_type (tp)) && "unsuitable type");
- DBGPRINT (2, (stdout, "new_name(): new name for type \"%s\"\n",
+ DBGPRINT (2, (stdout, "%s: new name for type \"%s\"\n",
+ __FUNCTION__,
get_type_name (tp)));
fflush (stdout);
- if (is_class_type (tp)) {
- obj_desc_t *obj_desc = NALLOC(sizeof(*obj_desc));
+ if (is_Class_type (tp)) {
+ obj_desc_t *obj_desc = NALLOC (sizeof (obj_desc_t));
int i;
int n_fields;
}
obj_desc->n_fields = n_fields;
- obj_desc->values = (qset_t**) NALLOC (n_fields * sizeof (qset_t));
+ obj_desc->values = (qset_t**) NALLOC (n_fields * sizeof (qset_t*));
for (i = 0; i < n_fields; i ++) {
obj_desc->values [i] = qset_new (N_INITIAL_OJBS, qset_obst);
}
desc = (desc_t*) obj_desc;
- } else if (is_array_type (tp)) {
+ } else if (is_Array_type (tp)) {
arr_desc_t *arr_desc = (arr_desc_t*) NALLOC (sizeof (arr_desc_t));
arr_desc->kind = array;
int missing = TRUE;
type *tp = get_entity_type (ent);
- assert (is_pointer_type (tp));
+ assert (is_Pointer_type (tp));
tp = get_pointer_points_to_type (tp);
- assert (is_class_type (tp));
+ assert (is_Class_type (tp));
- DBGPRINT (2, (stdout, "new_ent_name(): new name for entity \"%s\"\n",
+ DBGPRINT (2, (stdout, "%s: new name for entity \"%s\"\n",
+ __FUNCTION__,
get_entity_name (ent)));
DBGEXE (2, (fflush (stdout)));
errno = 0;
if (NULL == stream) {
- fprintf (stderr, "pto_dump_names(): unable to open %s (%s)\n",
- name, strerror (errno));
+ fprintf (stderr, "%s: unable to open %s (%s)\n",
+ __FUNCTION__, name, strerror (errno));
return;
}
/* Initialise the name module */
void pto_name_init (void)
{
- DBGPRINT (3, (stdout, "(%s:%i) pto_name_init()\n", __FILE__, __LINE__));
+ DBGPRINT (3, (stdout, "%s\n", __FUNCTION__));
assert (NULL == name_obst);
assert (NULL == qset_obst);
- name_obst = xmalloc (sizeof(*name_obst));
- qset_obst = xmalloc (sizeof(*qset_obst));
+ name_obst = xmalloc (sizeof (struct obstack));
+ qset_obst = xmalloc (sizeof (struct obstack));
obstack_init (name_obst);
obstack_init (qset_obst);
/* Cleanup the name module */
void pto_name_cleanup (void)
{
- DBGPRINT (3, (stdout, "(%s:%i) pto_name_cleanup()\n", __FILE__, __LINE__));
+ DBGPRINT (3, (stdout, "%s\n", __FUNCTION__));
obstack_free (name_obst, NULL);
obstack_free (qset_obst, NULL);
\f
/*
$Log$
+ Revision 1.13 2005/02/11 10:21:28 beck
+ get_entry now always returns a value
+
+ Revision 1.12 2005/01/14 14:13:56 liekweg
+ fix gnu extension, fix fprintf's, fix allocs
+
+ Revision 1.11 2005/01/05 14:25:54 beck
+ renames all is_x*_type() functions to is_X*_type() to prevent name clash with EDG fronten
+
Revision 1.10 2004/12/22 14:43:14 beck
made allocations C-like