diff options
author | schinz <schinz@epfl.ch> | 2003-04-01 09:25:48 +0000 |
---|---|---|
committer | schinz <schinz@epfl.ch> | 2003-04-01 09:25:48 +0000 |
commit | 7104fcb44257f28d8068c206628c6045365cd843 (patch) | |
tree | 4441f88ae686b9e57e36ebff49acbb2874da495f /sources | |
parent | 5092735baa0e79a464a45b96c395a8908556ead2 (diff) | |
download | scala-7104fcb44257f28d8068c206628c6045365cd843.tar.gz scala-7104fcb44257f28d8068c206628c6045365cd843.tar.bz2 scala-7104fcb44257f28d8068c206628c6045365cd843.zip |
- do not add the ABSTRACT_CLASS flag anymore, a...
- do not add the ABSTRACT_CLASS flag anymore, as a temporary fix
Diffstat (limited to 'sources')
-rw-r--r-- | sources/scalac/transformer/AddInterfaces.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sources/scalac/transformer/AddInterfaces.java b/sources/scalac/transformer/AddInterfaces.java index 16b06bdf3e..e8ff38a979 100644 --- a/sources/scalac/transformer/AddInterfaces.java +++ b/sources/scalac/transformer/AddInterfaces.java @@ -116,6 +116,10 @@ class AddInterfaces extends SubstTransformer { else return className; } + // Modifiers added to interfaces + // TODO we should put ABSTRACT_CLASS too but that doesn't work now. + protected int INTERFACE_MODS = Modifiers.INTERFACE | Modifiers.STATIC; + // Modifiers for which we do not create interfaces. protected int NO_INTERFACE_MODS = (Modifiers.MODUL | Modifiers.SYNTHETIC | Modifiers.JAVA); @@ -305,10 +309,7 @@ class AddInterfaces extends SubstTransformer { ifaceTmpl.setSymbol(impl.symbol().cloneSymbol()); ifaceTmpl.setType(ifaceSym.nextInfo()); - int ifaceMods = classDef.mods - | Modifiers.ABSTRACTCLASS - | Modifiers.INTERFACE - | Modifiers.STATIC; + int ifaceMods = classDef.mods | INTERFACE_MODS; ClassDef interfaceDef = (ClassDef)make.ClassDef(classDef.pos, ifaceMods, classDef.name, @@ -792,8 +793,7 @@ class AddInterfaces extends SubstTransformer { classConstrSym.updateInfo(cConstrType.subst(new Symbol[]{ifaceSym}, new Symbol[]{classSym})); - ifaceSym.flags |= - (Modifiers.ABSTRACTCLASS | Modifiers.INTERFACE | Modifiers.STATIC); + ifaceSym.flags |= INTERFACE_MODS; classToInterface.put(classSym, ifaceSym); super.traverse(impl); |