diff options
author | Paul Phillips <paulp@improving.org> | 2010-12-11 17:48:05 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2010-12-11 17:48:05 +0000 |
commit | 58b710073173ba7fac44041b294dc7b543db7224 (patch) | |
tree | f7e2f0bda10ce0dc59bd282bb1800b245e77017e /src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala | |
parent | 933148f71e1254089d036b2428a1c51cb2816c56 (diff) | |
download | scala-58b710073173ba7fac44041b294dc7b543db7224.tar.gz scala-58b710073173ba7fac44041b294dc7b543db7224.tar.bz2 scala-58b710073173ba7fac44041b294dc7b543db7224.zip |
Eliminating all possible warnings from trunk.
one deprecation, one unchecked, and one "other", each of which
volunteers no mechanism for suppression. (It would be nice to change
this.) No review.
Diffstat (limited to 'src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala')
-rw-r--r-- | src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala b/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala index d51997a1f9..49c6b2ffba 100644 --- a/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala +++ b/src/compiler/scala/tools/nsc/ast/parser/MarkupParsers.scala @@ -323,11 +323,12 @@ trait MarkupParsers /** Use a lookahead parser to run speculative body, and return the first char afterward. */ private def charComingAfter(body: => Unit): Char = { - input = input.lookaheadReader - body - val res = ch - input = parser.in - res + try { + input = input.lookaheadReader + body + ch + } + finally input = parser.in } /** xLiteral = element { element } |