From 77708ded5edeb19bae5811289202448a93c191fb Mon Sep 17 00:00:00 2001 From: michelou Date: Tue, 28 Nov 2006 17:02:09 +0000 Subject: added 'implicit' modifier in generated API docu... added 'implicit' modifier in generated API documentation --- src/compiler/scala/tools/nsc/ast/Trees.scala | 8 +++++--- src/compiler/scala/tools/nsc/models/Models.scala | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/compiler/scala/tools/nsc/ast/Trees.scala b/src/compiler/scala/tools/nsc/ast/Trees.scala index 57967a9294..230665f96e 100644 --- a/src/compiler/scala/tools/nsc/ast/Trees.scala +++ b/src/compiler/scala/tools/nsc/ast/Trees.scala @@ -1,5 +1,5 @@ /* NSC -- new Scala compiler - * Copyright 2005-2006 LAMP/EPFL + * Copyright 2005-2007 LAMP/EPFL * @author Martin Odersky */ // $Id$ @@ -7,9 +7,10 @@ package scala.tools.nsc.ast import java.io.{PrintWriter, StringWriter} + import scala.tools.nsc.symtab.Flags -import scala.tools.nsc.util.{HashSet,Position, SourceFile} -import symtab.Flags._ +import scala.tools.nsc.symtab.Flags._ +import scala.tools.nsc.util.{HashSet, Position, SourceFile} trait Trees requires Global { @@ -29,6 +30,7 @@ trait Trees requires Global { def isSealed = hasFlag(SEALED ) def isFinal = hasFlag(FINAL ) def isTrait = hasFlag(TRAIT ) + def isImplicit = hasFlag(IMPLICIT ) def isPublic = !isPrivate && !isProtected def hasFlag(flag: int) = (flag & flags) != 0 def & (flag: Int): Modifiers = { diff --git a/src/compiler/scala/tools/nsc/models/Models.scala b/src/compiler/scala/tools/nsc/models/Models.scala index a353ba83ec..1fe18a0ff5 100644 --- a/src/compiler/scala/tools/nsc/models/Models.scala +++ b/src/compiler/scala/tools/nsc/models/Models.scala @@ -48,7 +48,7 @@ abstract class Models { if (mods.isCase ) modString = "case" :: modString if (mods.isSealed ) modString = "sealed" :: modString if (mods.isFinal ) modString = "final" :: modString - //if (mods.isTrait ) modString = "trait" :: modString + if (mods.isImplicit ) modString = "implicit" :: modString modString } @@ -72,7 +72,7 @@ abstract class Models { else DEF } else if (term0.isClass) { - if (tree.asInstanceOf[MemberDef].mods.isTrait) TRAIT; + if (tree.asInstanceOf[MemberDef].mods.isTrait) TRAIT else CLASS } else if (term0.isModule) OBJECT -- cgit v1.2.3