+2003-06-07 Andreas Jaeger <aj@suse.de>
+
+ * symbol.c (ffesymbol_new_): Remove tests for macro
+ FFECOM_symbolHOOK.
+ * symbol.h: Likewise.
+
+ * storag.c (ffestorag_new): Remove tests for macro
+ FFECOM_storageHOOK.
+ * storag.h: Likewise.
+
+ * lab.c (ffelab_new): Remove tests for macro FFECOM_labelHOOK.
+ * lab.h: Likewise.
+
+ * global.c: Remove tests for macro FFECOM_globalHOOK.
+ * global.h (struct _ffeglobal_): Likewise.
+
+ * bld.h: Remove tests for macros FFECOM_constantHOOK,
+ FFECOM_nonterHOOK, FFECOM_globalHOOK, FFECOM_labelHOOK,
+ FFECOM_storageHOOK, FFECOM_symbolHOOK.
+ Remove code dependend on FFECOM_itemHOOK.
+ * bld.c: Likewise.
+
+ * com.h (FFECOM_constantHOOK): Remove define.
+ (FFECOM_nonterHOOK): Remove.
+ (FFECOM_globalHOOK): Remove.
+ (FFECOM_labelHOOK): Remove.
+ (FFECOM_storageHOOK): Remove.
+ (FFECOM_symbolHOOK): Remove.
+
+ * com.c (ffecom_get_external_identifier_): Remove usage of
+ FFETARGET_isENFORCED_MAIN_NAME.
+
+ * bld.c: Remove code dependend on FFEBLD_BLANK_, FFECOM_itemHOOK.
+ (ffebld_new_accter): Likewise.
+ (ffebld_new_arrter): Likewise.
+ (ffebld_new_conter_with_orig): Likewise.
+ (ffebld_new_item): Likewise.
+ (ffebld_new_labter): Likewise.
+ (ffebld_new_labtok): Likewise.
+ (ffebld_new_none): Likewise.
+ (ffebld_new_one): Likewise.
+ (ffebld_new_symter): Likewise.
+ (ffebld_new_two): Likewise.
+
Sat Jun 7 12:10:41 2003 Neil Booth <neil@daikokuya.co.uk>
* com.c (ffe_init_options): Update.
/* bld.c -- Implementation File (module.c template V1.0)
- Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 2003 Free Software Foundation, Inc.
Contributed by James Craig Burley.
This file is part of GNU Fortran.
/* Static objects accessed by functions in this module. */
-#if FFEBLD_BLANK_
-static struct _ffebld_ ffebld_blank_
-=
-{
- 0,
- {FFEINFO_basictypeNONE, FFEINFO_kindtypeNONE, 0, FFEINFO_kindNONE,
- FFEINFO_whereNONE, FFETARGET_charactersizeNONE},
- {NULL, NULL}
-};
-#endif
#if FFETARGET_okCHARACTER1
static ffebldConstant ffebld_constant_character1_;
#endif
nc->next = c->next;
nc->consttype = FFEBLD_constCHARACTER1;
nc->u.character1 = val;
-#ifdef FFECOM_constantHOOK
nc->hook = FFECOM_constantNULL;
-#endif
c->next = nc;
return nc;
nc->next = c->next;
nc->consttype = FFEBLD_constCOMPLEX1;
nc->u.complex1 = val;
-#ifdef FFECOM_constantHOOK
nc->hook = FFECOM_constantNULL;
-#endif
c->next = nc;
return nc;
nc->next = c->next;
nc->consttype = FFEBLD_constCOMPLEX2;
nc->u.complex2 = val;
-#ifdef FFECOM_constantHOOK
nc->hook = FFECOM_constantNULL;
-#endif
c->next = nc;
return nc;
nc->next = c->next;
nc->consttype = FFEBLD_constHOLLERITH;
nc->u.hollerith = val;
-#ifdef FFECOM_constantHOOK
nc->hook = FFECOM_constantNULL;
-#endif
c->next = nc;
return nc;
nc->next = c->next;
nc->consttype = FFEBLD_constINTEGER1;
nc->u.integer1 = val;
-#ifdef FFECOM_constantHOOK
nc->hook = FFECOM_constantNULL;
-#endif
c->next = nc;
return nc;
nc->next = c->next;
nc->consttype = FFEBLD_constINTEGER2;
nc->u.integer2 = val;
-#ifdef FFECOM_constantHOOK
nc->hook = FFECOM_constantNULL;
-#endif
c->next = nc;
return nc;
nc->next = c->next;
nc->consttype = FFEBLD_constINTEGER3;
nc->u.integer3 = val;
-#ifdef FFECOM_constantHOOK
nc->hook = FFECOM_constantNULL;
-#endif
c->next = nc;
return nc;
nc->next = c->next;
nc->consttype = FFEBLD_constINTEGER4;
nc->u.integer4 = val;
-#ifdef FFECOM_constantHOOK
nc->hook = FFECOM_constantNULL;
-#endif
c->next = nc;
return nc;
nc->next = c->next;
nc->consttype = FFEBLD_constLOGICAL1;
nc->u.logical1 = val;
-#ifdef FFECOM_constantHOOK
nc->hook = FFECOM_constantNULL;
-#endif
c->next = nc;
return nc;
nc->next = c->next;
nc->consttype = FFEBLD_constLOGICAL2;
nc->u.logical2 = val;
-#ifdef FFECOM_constantHOOK
nc->hook = FFECOM_constantNULL;
-#endif
c->next = nc;
return nc;
nc->next = c->next;
nc->consttype = FFEBLD_constLOGICAL3;
nc->u.logical3 = val;
-#ifdef FFECOM_constantHOOK
nc->hook = FFECOM_constantNULL;
-#endif
c->next = nc;
return nc;
nc->next = c->next;
nc->consttype = FFEBLD_constLOGICAL4;
nc->u.logical4 = val;
-#ifdef FFECOM_constantHOOK
nc->hook = FFECOM_constantNULL;
-#endif
c->next = nc;
return nc;
nc->next = c->next;
nc->consttype = FFEBLD_constREAL1;
nc->u.real1 = val;
-#ifdef FFECOM_constantHOOK
nc->hook = FFECOM_constantNULL;
-#endif
c->next = nc;
return nc;
nc->next = c->next;
nc->consttype = FFEBLD_constREAL2;
nc->u.real2 = val;
-#ifdef FFECOM_constantHOOK
nc->hook = FFECOM_constantNULL;
-#endif
c->next = nc;
return nc;
nc->next = c->next;
nc->consttype = type;
nc->u.typeless = val;
-#ifdef FFECOM_constantHOOK
nc->hook = FFECOM_constantNULL;
-#endif
c->next = nc;
return nc;
ffebld x;
x = ffebld_new ();
-#if FFEBLD_BLANK_
- *x = ffebld_blank_;
-#endif
x->op = FFEBLD_opACCTER;
x->u.accter.array = a;
x->u.accter.bits = b;
ffebld x;
x = ffebld_new ();
-#if FFEBLD_BLANK_
- *x = ffebld_blank_;
-#endif
x->op = FFEBLD_opARRTER;
x->u.arrter.array = a;
x->u.arrter.size = size;
ffebld x;
x = ffebld_new ();
-#if FFEBLD_BLANK_
- *x = ffebld_blank_;
-#endif
x->op = FFEBLD_opCONTER;
x->u.conter.expr = c;
x->u.conter.orig = o;
ffebld x;
x = ffebld_new ();
-#if FFEBLD_BLANK_
- *x = ffebld_blank_;
-#endif
x->op = FFEBLD_opITEM;
x->u.item.head = head;
x->u.item.trail = trail;
-#ifdef FFECOM_itemHOOK
- x->u.item.hook = FFECOM_itemNULL;
-#endif
return x;
}
ffebld x;
x = ffebld_new ();
-#if FFEBLD_BLANK_
- *x = ffebld_blank_;
-#endif
x->op = FFEBLD_opLABTER;
x->u.labter = l;
return x;
ffebld x;
x = ffebld_new ();
-#if FFEBLD_BLANK_
- *x = ffebld_blank_;
-#endif
x->op = FFEBLD_opLABTOK;
x->u.labtok = t;
return x;
ffebld x;
x = ffebld_new ();
-#if FFEBLD_BLANK_
- *x = ffebld_blank_;
-#endif
x->op = o;
return x;
}
ffebld x;
x = ffebld_new ();
-#if FFEBLD_BLANK_
- *x = ffebld_blank_;
-#endif
x->op = o;
x->u.nonter.left = left;
-#ifdef FFECOM_nonterHOOK
x->u.nonter.hook = FFECOM_nonterNULL;
-#endif
return x;
}
ffebld x;
x = ffebld_new ();
-#if FFEBLD_BLANK_
- *x = ffebld_blank_;
-#endif
x->op = FFEBLD_opSYMTER;
x->u.symter.symbol = s;
x->u.symter.generic = gen;
ffebld x;
x = ffebld_new ();
-#if FFEBLD_BLANK_
- *x = ffebld_blank_;
-#endif
x->op = o;
x->u.nonter.left = left;
x->u.nonter.right = right;
-#ifdef FFECOM_nonterHOOK
x->u.nonter.hook = FFECOM_nonterNULL;
-#endif
return x;
}
/* bld.h -- Public #include File (module.h template V1.0)
- Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 2003 Free Software Foundation, Inc.
Contributed by James Craig Burley.
This file is part of GNU Fortran.
{
ffebld left;
ffebld right;
-#ifdef FFECOM_nonterHOOK
ffecomNonter hook; /* Whatever the compiler/backend wants! */
-#endif
}
nonter;
struct
{
ffebld head;
ffebld trail;
-#ifdef FFECOM_itemHOOK
- ffecomItem hook; /* Whatever the compiler/backend wants! */
-#endif
}
item;
struct
real. */
ffebldConstant negated; /* We point to each other through here. */
ffebldConst consttype;
-#ifdef FFECOM_constantHOOK
ffecomConstant hook; /* Whatever the compiler/backend wants! */
-#endif
bool numeric; /* A numeric kind of constant. */
ffebldConstantUnion u;
};
if (!ffe_is_underscoring ()
|| (strcmp (name, FFETARGET_nameBLANK_COMMON) == 0)
-#if FFETARGET_isENFORCED_MAIN_NAME
- || (strcmp (name, FFETARGET_nameENFORCED_NAME) == 0)
-#else
|| (strcmp (name, FFETARGET_nameUNNAMED_MAIN) == 0)
-#endif
|| (strcmp (name, FFETARGET_nameUNNAMED_BLOCK_DATA) == 0))
return get_identifier (name);
/* com.h -- Public #include File (module.h template V1.0)
- Copyright (C) 1995, 1996, 1997, 2000 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1997, 2000, 2003
+ Free Software Foundation, Inc.
Contributed by James Craig Burley.
This file is part of GNU Fortran.
#endif
typedef tree ffecomConstant;
-#define FFECOM_constantHOOK
typedef tree ffecomNonter;
-#define FFECOM_nonterHOOK
typedef tree ffecomLabel;
-#define FFECOM_globalHOOK
typedef tree ffecomGlobal;
-#define FFECOM_labelHOOK
typedef tree ffecomStorage;
-#define FFECOM_storageHOOK
typedef struct _ffecom_symbol_ ffecomSymbol;
-#define FFECOM_symbolHOOK
struct _ffecom_symbol_
{
/* global.c -- Implementation File (module.c template V1.0)
- Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1997, 2003 Free Software Foundation, Inc.
Contributed by James Craig Burley.
This file is part of GNU Fortran.
g = (ffeglobal) malloc_new_ks (malloc_pool_image (), "FFEGLOBAL",
sizeof (*g));
g->n = n;
-#ifdef FFECOM_globalHOOK
g->hook = FFECOM_globalNULL;
-#endif
g->tick = 0;
ffename_set_global (n, g);
/* We've learned more, so point to where we learned it. */
g->t = ffelex_token_use (t);
g->type = type;
-#ifdef FFECOM_globalHOOK
g->hook = FFECOM_globalNULL; /* Discard previous _DECL. */
-#endif
g->u.proc.n_args = -1;
}
/* global.h -- Public #include File (module.h template V1.0)
- Copyright (C) 1995, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1997, 2003 Free Software Foundation, Inc.
Contributed by James Craig Burley.
This file is part of GNU Fortran.
{
ffelexToken t;
ffename n;
-#ifdef FFECOM_globalHOOK
ffecomGlobal hook;
-#endif
ffeCounter tick; /* Recent transition in this progunit. */
ffeglobalType type;
bool intrinsic; /* Known as intrinsic? */
/* lab.c -- Implementation File (module.c template V1.0)
- Copyright (C) 1995 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2003 Free Software Foundation, Inc.
Contributed by James Craig Burley.
This file is part of GNU Fortran.
++ffelab_num_news_;
l = (ffelab) malloc_new_ks (ffe_pool_any_unit (), "FFELAB label", sizeof (*l));
l->next = ffelab_list_;
-#ifdef FFECOM_labelHOOK
l->hook = FFECOM_labelNULL;
-#endif
l->value = v;
l->firstref_line = ffewhere_line_unknown ();
l->firstref_col = ffewhere_column_unknown ();
/* lab.h -- Public #include File (module.h template V1.0)
- Copyright (C) 1995 Free Software Foundation, Inc.
+ Copyright (C) 1995, 2003 Free Software Foundation, Inc.
Contributed by James Craig Burley.
This file is part of GNU Fortran.
struct _ffelab_
{
ffelab next;
-#ifdef FFECOM_labelHOOK
ffecomLabel hook;
-#endif
ffelabValue value; /* 1 through 99999, or 100000+ for temp
labels. */
unsigned long blocknum; /* Managed entirely by user of module. */
/* storag.c -- Implementation File (module.c template V1.0)
- Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 2003 Free Software Foundation, Inc.
Contributed by James Craig Burley.
This file is part of GNU Fortran.
sizeof (*s));
s->next = (ffestorag) &sl->first;
s->previous = sl->last;
-#ifdef FFECOM_storageHOOK
s->hook = FFECOM_storageNULL;
-#endif
s->previous->next = s;
sl->last = s;
s->equivs_.first = s->equivs_.last = (ffestorag) &s->equivs_.first;
/* storag.h -- Public #include File (module.h template V1.0)
- Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 2003 Free Software Foundation, Inc.
Contributed by James Craig Burley.
This file is part of GNU Fortran.
LOCAL. */
ffetargetAlign alignment; /* Initial alignment for entity. */
ffetargetAlign modulo; /* Modulo within alignment. */
-#ifdef FFECOM_storageHOOK
ffecomStorage hook; /* Whatever the backend needs here. */
-#endif
ffestoragType type;
ffeinfoBasictype basic_type;/* NONE= >1 non-CHARACTER; ANY=
CHAR+non-CHAR. */
/* Implementation of Fortran symbol manager
- Copyright (C) 1995, 1996, 1997 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 1997, 2003
+ Free Software Foundation, Inc.
Contributed by James Craig Burley.
This file is part of GNU Fortran.
s->common = NULL;
s->equiv = NULL;
s->storage = NULL;
-#ifdef FFECOM_symbolHOOK
s->hook = FFECOM_symbolNULL;
-#endif
s->sfa_dummy_parent = NULL;
s->func_result = NULL;
s->value = 0;
/* Interface definitions for Fortran symbol manager
- Copyright (C) 1995, 1996 Free Software Foundation, Inc.
+ Copyright (C) 1995, 1996, 2003 Free Software Foundation, Inc.
Contributed by James Craig Burley.
This file is part of GNU Fortran.
ffeequiv equiv; /* Who have I been equivalenced with? */
ffestorag storage; /* Where am I in relation to my outside
world? */
-#ifdef FFECOM_symbolHOOK
ffecomSymbol hook; /* Whatever the compiler/backend wants! */
-#endif
ffesymbol sfa_dummy_parent; /* "X" outside sfunc "CIRC(X) = 3.14 * X". */
ffesymbol func_result; /* FUN sym's corresponding RES sym, & vice
versa. */