d0p1/ack
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fixed problem with importing enumeration literals

Browse source
This commit is contained in:
ceriel 1989-02-08 10:24:10 +00:00
parent 7c22618cb8
commit fb88f5dbdd
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lang/m2/comp/enter.c
View file

@ -255,8 +255,18 @@ ImportEffects(idef, scope, flag)
/* Also import all enumeration literals /* Also import all enumeration literals
*/ */
for (df = tp->enm_enums; df; df = df->enm_next) { for (df = tp->enm_enums; df; df = df->enm_next) {
/* But be careful; we could have a situation where f.i.
different subrange types of the enumeration type
are imported. If the literal is already imported
in some way, don't do it again; we don't want
a multiple defined error message here.
*/
t_def *df1;
df->df_flags |= D_QEXPORTED; df->df_flags |= D_QEXPORTED;
if (! DoImport(df, scope, flag|D_USED)) assert(0); if ((!(df1 = lookup(df->df_idf, scope, D_IMPORT, 0)) ||
df1 != df) &&
! DoImport(df, scope, flag|D_USED)) assert(0);
/* don't complain when not used ... */ /* don't complain when not used ... */
} }
idef->df_flags |= D_USED; /* don't complain ... */ idef->df_flags |= D_USED; /* don't complain ... */