diff options
author | michelou <michelou@epfl.ch> | 2011-09-29 13:23:15 +0000 |
---|---|---|
committer | michelou <michelou@epfl.ch> | 2011-09-29 13:23:15 +0000 |
commit | f9aa83a6e5086774e904638d183726edfe324a00 (patch) | |
tree | 2e4f6f889a49973b97baa5c5f8879c1807dc9e20 /src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | |
parent | 4529141cc154a9d7359e16344d7a318ca529f89f (diff) | |
download | scala-f9aa83a6e5086774e904638d183726edfe324a00.tar.gz scala-f9aa83a6e5086774e904638d183726edfe324a00.tar.bz2 scala-f9aa83a6e5086774e904638d183726edfe324a00.zip |
Removed special comments on Martin's request
Diffstat (limited to 'src/compiler/scala/tools/nsc/ast/parser/Parsers.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | 18 |
1 files changed, 2 insertions, 16 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala index 615efb986a..0ae8516de9 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala @@ -118,7 +118,7 @@ trait ParsersCommon extends ScannersCommon { * </li> * </ol> */ -trait Parsers extends Scanners /*@XML*/ with MarkupParsers /*XML@*/ with ParsersCommon { +trait Parsers extends Scanners with MarkupParsers with ParsersCommon { self => val global: Global import global._ @@ -158,7 +158,6 @@ self => def incompleteInputError(msg: String): Unit = throw new MalformedInput(source.content.length - 1, msg) /** the markup parser */ -/*@XML*/ lazy val xmlp = new MarkupParser(this, true) object symbXMLBuilder extends SymbolicXMLBuilder(this, true) { // DEBUG choices @@ -168,7 +167,6 @@ self => def xmlLiteral : Tree = xmlp.xLiteral def xmlLiteralPattern : Tree = xmlp.xLiteralPattern -/*XML@*/ } class OutlineParser(source: SourceFile) extends SourceFileParser(source) { @@ -177,16 +175,12 @@ self => accept(LBRACE) var openBraces = 1 while (in.token != EOF && openBraces > 0) { - /*@XML*/ if (in.token == XMLSTART) xmlLiteral() else { - /*XML@*/ if (in.token == LBRACE) openBraces += 1 else if (in.token == RBRACE) openBraces -= 1 in.nextToken() - /*@XML*/ } - /*XML@*/ } body } @@ -630,7 +624,7 @@ self => def isExprIntroToken(token: Int): Boolean = isLiteralToken(token) || (token match { case IDENTIFIER | BACKQUOTED_IDENT | THIS | SUPER | IF | FOR | NEW | USCORE | TRY | WHILE | - DO | RETURN | THROW | LPAREN | LBRACE /*@XML*/| XMLSTART /*XML@*/ => true + DO | RETURN | THROW | LPAREN | LBRACE | XMLSTART => true case _ => false }) @@ -1455,9 +1449,7 @@ self => } else simpleExpr() } - /*@XML*/ def xmlLiteral(): Tree - /*XML@*/ /** {{{ * SimpleExpr ::= new (ClassTemplate | TemplateBody) @@ -1477,10 +1469,8 @@ self => val t = if (isLiteral) atPos(in.offset)(literal(false)) else in.token match { - /*@XML*/ case XMLSTART => xmlLiteral() - /*XML@*/ case IDENTIFIER | BACKQUOTED_IDENT | THIS | SUPER => path(true, false) case USCORE => @@ -1826,10 +1816,8 @@ self => atPos(start) { literal(false) } case LPAREN => atPos(start)(makeParens(noSeq.patterns())) - /*@XML*/ case XMLSTART => xmlLiteralPattern() - /*XML@*/ case _ => syntaxErrorOrIncomplete("illegal start of simple pattern", true) errorPatternTree @@ -1871,9 +1859,7 @@ self => if (in.token == RPAREN) Nil else seqPatterns() } - /*@XML*/ def xmlLiteralPattern(): Tree - /*XML@*/ /* -------- MODIFIERS and ANNOTATIONS ------------------------------------------- */ |