From 6a988aeff0f426480ce50ebfbe0dcb50c3f4753a Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Wed, 27 Apr 2011 18:36:04 +0000 Subject: Fixed a booch I made in io.Position's positioning. Closes #4498, no review. --- src/library/scala/io/Position.scala | 2 +- test/files/run/io-position.check | Bin 0 -> 126 bytes test/files/run/io-position.scala | 13 +++++++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 test/files/run/io-position.check create mode 100644 test/files/run/io-position.scala diff --git a/src/library/scala/io/Position.scala b/src/library/scala/io/Position.scala index 5b6accfea3..917d61ec25 100644 --- a/src/library/scala/io/Position.scala +++ b/src/library/scala/io/Position.scala @@ -51,7 +51,7 @@ abstract class Position { if (line >= LINE_MASK) LINE_MASK << COLUMN_BITS else - (line << COLUMN_BITS) | math.min(LINE_MASK, line) + (line << COLUMN_BITS) | math.min(COLUMN_MASK, column) } /** Returns the line number of the encoded position. */ diff --git a/test/files/run/io-position.check b/test/files/run/io-position.check new file mode 100644 index 0000000000..09f743d750 Binary files /dev/null and b/test/files/run/io-position.check differ diff --git a/test/files/run/io-position.scala b/test/files/run/io-position.scala new file mode 100644 index 0000000000..7e570ea29e --- /dev/null +++ b/test/files/run/io-position.scala @@ -0,0 +1,13 @@ +object Test { + Console.setErr(Console.out) + + def main(args: Array[String]): Unit = { + try { + xml.parsing.ConstructingParser.fromSource(io.Source.fromString(""), false).document() + } catch { + case e:Exception => println(e.getMessage) + } + } + +} + -- cgit v1.2.3