diff options
author | Paul Phillips <paulp@improving.org> | 2012-10-18 15:11:06 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-10-19 09:04:19 -0700 |
commit | 3fea5453b6a6c9451ecd6d0a93b92432b575e6cb (patch) | |
tree | 6e010951cdd253747afe18912547ca6d3fce2e6e /test/scaladoc/resources/SI-6509.scala | |
parent | 32d470d61195cbf092614711b27db396d0d54a40 (diff) | |
parent | 87c5895d4bae62f1b5bacbd145f2e0fddcccf423 (diff) | |
download | scala-3fea5453b6a6c9451ecd6d0a93b92432b575e6cb.tar.gz scala-3fea5453b6a6c9451ecd6d0a93b92432b575e6cb.tar.bz2 scala-3fea5453b6a6c9451ecd6d0a93b92432b575e6cb.zip |
Merge remote-tracking branch 'origin/2.10.x' into merge-210
* origin/2.10.x: (52 commits)
JavaUniverse
Moved @contentDiagram in Symbols
Adds lots of new documentation for TypeTags, Mirrors, Universes and more
runtime.JavaUniverse - put ungrouped members at the top
Forgotten annotation in Annotations
Diagram tweaking
Grouping for reflection and macros
fixes a typo
scala.reflect.api.Symbols documentation
Symbols docs cleanup, mostly moved to guide
scala.reflect.api.Position documentation
scala.reflect.api.StandardNames documentation
scala.reflect.api.Constants documentation
removed docs for internal TypeCreator and TreeCreator
simplified reflection docs for trees
Rearranged some reflection docs, moving things to the guide
reflection docs improvements and moves to doc page
docs for reflection and macros
SI-6509 Correct @template owners
SI-6155 Scaladoc @template diagrms
...
Conflicts:
src/compiler/scala/tools/nsc/doc/model/ModelFactory.scala
src/compiler/scala/tools/nsc/typechecker/Typers.scala
src/reflect/scala/reflect/api/Trees.scala
test/scaladoc/run/links.scala
Diffstat (limited to 'test/scaladoc/resources/SI-6509.scala')
-rw-r--r-- | test/scaladoc/resources/SI-6509.scala | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/test/scaladoc/resources/SI-6509.scala b/test/scaladoc/resources/SI-6509.scala new file mode 100644 index 0000000000..540ba243bd --- /dev/null +++ b/test/scaladoc/resources/SI-6509.scala @@ -0,0 +1,24 @@ +package test.scaladoc.template.owners + +trait X { + /** @template */ + type Symbol >: Null <: SymbolApi + + /** @template */ + type TypeSymbol >: Null <: Symbol with TypeSymbolApi + + /** @template */ + type TermSymbol >: Null <: Symbol with TermSymbolApi + + /** @template */ + type MethodSymbol >: Null <: TermSymbol with MethodSymbolApi + + trait SymbolApi { this: Symbol => def x: Int} + trait TermSymbolApi extends SymbolApi { this: TermSymbol => def y: Int} + trait TypeSymbolApi extends SymbolApi { this: TypeSymbol => def z: Int} + trait MethodSymbolApi extends TermSymbolApi { this: MethodSymbol => def t: Int } +} + +trait Y extends X +trait Z extends Y +trait T extends Z |