summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2007-06-15 18:00:19 +0000
committerMartin Odersky <odersky@gmail.com>2007-06-15 18:00:19 +0000
commit225fac5af513f7bc7edd7b7e8e262ab151ef823e (patch)
tree06bf7b50cd2486323994fe32999bdc2754c37cac /src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
parentba3b4ba405c66059a3ca7809557d988358fa7162 (diff)
downloadscala-225fac5af513f7bc7edd7b7e8e262ab151ef823e.tar.gz
scala-225fac5af513f7bc7edd7b7e8e262ab151ef823e.tar.bz2
scala-225fac5af513f7bc7edd7b7e8e262ab151ef823e.zip
more existentials
Diffstat (limited to 'src/compiler/scala/tools/nsc/ast/parser/Parsers.scala')
-rw-r--r--src/compiler/scala/tools/nsc/ast/parser/Parsers.scala7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
index a6fccb50c2..abe2248b3e 100644
--- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
+++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
@@ -659,7 +659,10 @@ trait Parsers {
t
}
- /** Type ::= Type1 [where `{' {WhereClause} `}']
+ /** Type ::= Type1 [for_some `{' WhereClause {semi WhereClause}} `}']
+ * WhereClause ::= type TypeDcl
+ * | val ValDcl
+ * |
*/
def typ(): Tree = {
val t = typ1()
@@ -2211,7 +2214,7 @@ trait Parsers {
templateBody()
} else {
if (inToken == LPAREN)
- syntaxError((if (traitParentSeen) "parents of traits" else "traits")+
+ syntaxError((if (traitParentSeen) "parents of traits" else "traits or objects")+
" may not have parameters", true)
(emptyValDef, List())
}