natas_hw
/
legacy-svn-scala
mirror of https://github.com/scala/legacy-svn-scala
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

disabling sequence pattern parsing (a,b) 

git-svn-id: http://lampsvn.epfl.ch/svn-repos/scala/scala/trunk@6753 5e8d7ff9-d8ef-0310-90f0-a4852d11357a
This commit is contained in:
emir 2006-03-14 16:45:24 +00:00
parent 7fed6446e6
commit 487fcd59e2
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/compiler/scala/tools/nsc/ast/parser/Parsers.scala
View File

@ -988,10 +988,10 @@ trait Parsers requires SyntaxAnalyzer {
* | `_' `:' Type1
* | [SeqPattern2]
*/
def pattern1(seqOK: boolean): Tree =
if (seqOK && !isExprIntro) {
atPos(in.currentPos) { Sequence(List()) }
} else {
def pattern1(seqOK: boolean): Tree = {
//if (false && /*disabled, no regexp matching*/ seqOK && !isExprIntro) {
//atPos(in.currentPos) { Sequence(List()) }
//} else {
val p = pattern2(seqOK);
p match {
case Ident(name) if (treeInfo.isVariableName(name) && in.token == COLON) =>
@ -999,6 +999,7 @@ trait Parsers requires SyntaxAnalyzer {
case _ =>
p
}
//}
}
/* Pattern2 ::= varid [ @ Pattern3 ]
@ -1089,8 +1090,9 @@ trait Parsers requires SyntaxAnalyzer {
case LPAREN =>
val pos = in.skipToken();
val p =
if (seqOK) atPos(pos) { makeSequence(patterns()) }
else if (in.token != RPAREN) pattern(false);
//if (false /*disabled, no regexp matching*/ && seqOK) atPos(pos) { makeSequence(patterns()) }
//else
if (in.token != RPAREN) pattern(false);
else Literal(()).setPos(pos);
accept(RPAREN);
p
@ -1628,7 +1630,7 @@ trait Parsers requires SyntaxAnalyzer {
atPos(in.currentPos) {
def acceptEmptyTemplateBody(msg: String): unit = {
if (in.token == LPAREN && settings.migrate.value)
syntaxErrorMigrate("mixin classes may not have parameters");
syntaxErrorMigrate("traites may not have parameters");
if (!(in.token == SEMI || in.token == NEWLINE ||
in.token == COMMA || in.token == RBRACE || in.token == EOF))
syntaxError(msg, true);