diff options
author | Martin Odersky <odersky@gmail.com> | 2016-09-10 20:58:34 +0200 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2016-10-02 16:11:21 +0200 |
commit | d575e585389b025d7b8056bcb43fea67dddd15d0 (patch) | |
tree | 657453c9e17f109e29ead11d52807d1e335930ae /tests/pos/rbtree.scala | |
parent | e93b7bfe770c8950a52d17bb0aebd3e0a5e93b3c (diff) | |
download | dotty-d575e585389b025d7b8056bcb43fea67dddd15d0.tar.gz dotty-d575e585389b025d7b8056bcb43fea67dddd15d0.tar.bz2 dotty-d575e585389b025d7b8056bcb43fea67dddd15d0.zip |
Make inline a keyword
`inline` is now a modifier keyword. To keep disruption tolerable,
we still allow `@inline` as an annotation as well. Other uses of
`inline` are supported only under `-language:Scala2` and are rewritten
to identifiers in backticks.
Diffstat (limited to 'tests/pos/rbtree.scala')
-rw-r--r-- | tests/pos/rbtree.scala | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/pos/rbtree.scala b/tests/pos/rbtree.scala index 1401a1231..04c084596 100644 --- a/tests/pos/rbtree.scala +++ b/tests/pos/rbtree.scala @@ -430,12 +430,12 @@ object RedBlackTree { * An alternative is to implement the these classes using plain old Java code... */ sealed abstract class Tree[A, +B]( - @(inline @getter) final val key: A, - @(inline @getter) final val value: B, - @(inline @getter) final val left: Tree[A, B], - @(inline @getter) final val right: Tree[A, B]) + @(`inline` @getter) final val key: A, + @(`inline` @getter) final val value: B, + @(`inline` @getter) final val left: Tree[A, B], + @(`inline` @getter) final val right: Tree[A, B]) extends Serializable { - @(inline @getter) final val count: Int = 1 + RedBlackTree.count(left) + RedBlackTree.count(right) + @(`inline` @getter) final val count: Int = 1 + RedBlackTree.count(left) + RedBlackTree.count(right) def black: Tree[A, B] def red: Tree[A, B] } |