diff options
| author | buraq <buraq@epfl.ch> | 2003-09-11 09:47:40 +0000 |
|---|---|---|
| committer | buraq <buraq@epfl.ch> | 2003-09-11 09:47:40 +0000 |
| commit | c015c50dd2988aab0f2398ad24c55ca11bffcba0 (patch) | |
| tree | 0aaac06e6ce88e4457a41a3963fb5b954901c8a1 /sources | |
| parent | e46d223383b2d5fabf096aa46ed9f23d8630226f (diff) | |
| download | scala-c015c50dd2988aab0f2398ad24c55ca11bffcba0.tar.gz scala-c015c50dd2988aab0f2398ad24c55ca11bffcba0.tar.bz2 scala-c015c50dd2988aab0f2398ad24c55ca11bffcba0.zip | |
changed type1() to type() in pattern parsing,
and pattern() to validPattern() in patDefOrDcl()
Diffstat (limited to 'sources')
| -rw-r--r-- | sources/scalac/ast/parser/Parser.java | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sources/scalac/ast/parser/Parser.java b/sources/scalac/ast/parser/Parser.java index 7206114a39..a4ed9abad0 100644 --- a/sources/scalac/ast/parser/Parser.java +++ b/sources/scalac/ast/parser/Parser.java @@ -1194,8 +1194,8 @@ public class Parser implements Tokens { return first; } - /** TreePattern ::= varid `:' Type1 - * | `_' `:' Type1 + /** TreePattern ::= varid `:' Type + * | `_' `:' Type * | SimplePattern [ '*' | '?' | '+' ] * | SimplePattern {Id SimplePattern} // op2 must not be empty */ @@ -1203,8 +1203,9 @@ public class Parser implements Tokens { int base = sp; Tree top = simplePattern(); if (s.token == COLON) { - if (TreeInfo.isVarPattern(top)) - return make.Typed(s.skipToken(), top, type1()); + if (TreeInfo.isVarPattern(top)) { + return make.Typed(s.skipToken(), top, type()); + } } if (s.token == IDENTIFIER) { if (s.name == STAR) { /* p* becomes z@( |(p,z)) */ @@ -1687,7 +1688,7 @@ public class Parser implements Tokens { */ Tree patDefOrDcl(int mods) { int pos = s.pos; - Tree pat = pattern(); + Tree pat = validPattern(); Tree tp; switch (pat) { case Typed(Tree pat1, Tree tp1): |