diff options
author | Martin Odersky <odersky@gmail.com> | 2007-03-06 17:43:03 +0000 |
---|---|---|
committer | Martin Odersky <odersky@gmail.com> | 2007-03-06 17:43:03 +0000 |
commit | 4ba667134f2a190087675c625fa9d91607fe3231 (patch) | |
tree | fcc9c8b09d6fbefc550eb834158b5e6ff3bec1d5 /src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | |
parent | 70e2162afee52f9e52e652e55a5ab3bbdc550214 (diff) | |
download | scala-4ba667134f2a190087675c625fa9d91607fe3231.tar.gz scala-4ba667134f2a190087675c625fa9d91607fe3231.tar.bz2 scala-4ba667134f2a190087675c625fa9d91607fe3231.zip |
modified annotated types scheme
Diffstat (limited to 'src/compiler/scala/tools/nsc/ast/parser/Parsers.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala index 6f4247b49e..71522aae4e 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala @@ -669,8 +669,7 @@ trait Parsers requires SyntaxAnalyzer { * | `(' ArgTypePats [`,'] `)' */ def annotType(isPattern: boolean): Tree = { - val annots = if (settings.Xplugtypes.value) typeAttributes() - else annotations() + val annots = annotations() val pos = in.currentPos var t: Tree = if (in.token == LPAREN) { @@ -701,8 +700,7 @@ trait Parsers requires SyntaxAnalyzer { } else done=true } - if (settings.Xplugtypes.value) t.withAttributes(annots) - else (t /: annots) (makeAnnotated) + (t /: annots) (makeAnnotated) } /** TypeArgs ::= `[' ArgType {`,' ArgType} `]' |