diff options
author | Sean McDirmid <sean.mcdirmid@gmail.com> | 2007-04-03 10:36:38 +0000 |
---|---|---|
committer | Sean McDirmid <sean.mcdirmid@gmail.com> | 2007-04-03 10:36:38 +0000 |
commit | 0769f6476444d49c1801f610daf929beb50e64f4 (patch) | |
tree | 65c1f012b378e1d7e81d2f49743b3a5da0b9ab64 /src/compiler | |
parent | 6948de6a3df8ea8b60818c1bd1435a84ae78a59f (diff) | |
download | scala-0769f6476444d49c1801f610daf929beb50e64f4.tar.gz scala-0769f6476444d49c1801f610daf929beb50e64f4.tar.bz2 scala-0769f6476444d49c1801f610daf929beb50e64f4.zip |
Removing 1.5 specific APIs
Diffstat (limited to 'src/compiler')
-rw-r--r-- | src/compiler/scala/tools/nsc/doc/DocGenerator.scala | 6 | ||||
-rw-r--r-- | src/compiler/scala/tools/nsc/doc/ModelExtractor.scala | 17 |
2 files changed, 13 insertions, 10 deletions
diff --git a/src/compiler/scala/tools/nsc/doc/DocGenerator.scala b/src/compiler/scala/tools/nsc/doc/DocGenerator.scala index 5ca3b6a323..9fc93f2009 100644 --- a/src/compiler/scala/tools/nsc/doc/DocGenerator.scala +++ b/src/compiler/scala/tools/nsc/doc/DocGenerator.scala @@ -691,7 +691,11 @@ abstract class DocGenerator extends Models { val dir = if (sym.toplevelClass.isPackageClass) sym.toplevelClass else sym.toplevelClass.owner - val name = dir.fullNameString('/') + "/" + sym.sourceFile.name.replace(".scala", "") + val name = { + //dir.fullNameString('/') + "/" + sym.sourceFile.name.replace(".scala", "") + if (true) throw new Error + "" + } <span> <hr/> in {aref(urlFor(sym.owner), "_self", sym.owner.fullNameString('.'))} diff --git a/src/compiler/scala/tools/nsc/doc/ModelExtractor.scala b/src/compiler/scala/tools/nsc/doc/ModelExtractor.scala index cd98915002..3ea636f02b 100644 --- a/src/compiler/scala/tools/nsc/doc/ModelExtractor.scala +++ b/src/compiler/scala/tools/nsc/doc/ModelExtractor.scala @@ -223,9 +223,8 @@ trait ModelExtractor { } }); } - def members0(f : Symbol => Boolean) = decls.pfilter(e => f(e)).valueSet; + def members0(f : Symbol => Boolean) = decls.pfilterKeys(e => f(e)).valueSet; def members(c : Category) : Iterable[Member] = members0(c.f); - object inherited extends jcl.LinkedHashMap[Symbol,List[Member]]() { override def default(tpe : Symbol) = Nil; { @@ -324,22 +323,22 @@ trait ModelExtractor { } def Member(sym : Symbol) : Option[Member] = { import global._; - import symtab.Flags._; + import symtab.Flags; if (!isVisible(sym)) return None; - if (sym.hasFlag(ACCESSOR)) { + if (sym.hasFlag(Flags.ACCESSOR)) { if (sym.isSetter) return None; assert(sym.isGetter); return Some[Member](new Val(sym.asInstanceOf[TermSymbol])); } else if (sym.isValue && !sym.isMethod && !sym.isModule) { - if (!sym.hasFlag(JAVA)) { + if (!sym.hasFlag(Flags.JAVA)) { Console.println("SYM: " + sym + " " + sym.fullNameString('.')); - Console.println("FLA: " + symtab.Flags.flagsToString(sym.flags)); + Console.println("FLA: " + Flags.flagsToString(sym.flags)); } - assert(sym.hasFlag(JAVA)); + assert(sym.hasFlag(Flags.JAVA)); return Some[Member](new Val(sym.asInstanceOf[TermSymbol])); } if (sym.isValue && !sym.isModule) { - val str = symtab.Flags.flagsToString(sym.flags); + val str = Flags.flagsToString(sym.flags); assert(sym.isMethod); return new Some[Member](new Def(sym.asInstanceOf[TermSymbol])); } @@ -388,7 +387,7 @@ trait ModelExtractor { case _ => } if (eA.getClass != eB.getClass) { - val diff = eA.getClass.getCanonicalName.compare(eB.getClass.getCanonicalName); + val diff = eA.getClass.getName.compare(eB.getClass.getName); assert(diff != 0); return diff; } |