diff options
| author | Paul Phillips <paulp@improving.org> | 2011-06-10 16:27:55 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-06-10 16:27:55 +0000 |
| commit | 07fab88cee34e5f59cf88f0dc8e61f2b8817eb24 (patch) | |
| tree | b19def1e161712faa4f8af22b7d5c68ef356a450 /src | |
| parent | 28e6744e2305f523d16458a9d8c748903e33aca5 (diff) | |
| download | scala-07fab88cee34e5f59cf88f0dc8e61f2b8817eb24.tar.gz scala-07fab88cee34e5f59cf88f0dc8e61f2b8817eb24.tar.bz2 scala-07fab88cee34e5f59cf88f0dc8e61f2b8817eb24.zip | |
Reverts r25036, "Altered the positioning of XML...
Reverts r25036, "Altered the positioning of XML literal trees" because
the IDE did not like it. No review.
Diffstat (limited to 'src')
| -rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/Parsers.scala | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala index 1a0409d440..c7134ce91a 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/Parsers.scala @@ -1429,17 +1429,11 @@ self => */ def simpleExpr(): Tree = { var canApply = true - val start = in.offset val t = - if (isLiteral) atPos(start)(literal(false)) + if (isLiteral) atPos(in.offset)(literal(false)) else in.token match { case XMLSTART => - // Using setPos here because the generated tree has its position - // off by one and I'm not sure where to fix it. - // <a></a> - // ^--- This was positioned at the a, not the < - val lit = xmlLiteral() - lit setPos r2p(start, start, in.offset) + xmlLiteral() case IDENTIFIER | BACKQUOTED_IDENT | THIS | SUPER => path(true, false) case USCORE => |