summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2011-04-27 18:36:04 +0000
committerPaul Phillips <paulp@improving.org>2011-04-27 18:36:04 +0000
commit6a988aeff0f426480ce50ebfbe0dcb50c3f4753a (patch)
tree041fa2490174f12bf3bc1fe099b61ee44ae2e5f6 /src
parent1a443ebb205a2e79951d212567fca0d7bd7dcd7e (diff)
downloadscala-6a988aeff0f426480ce50ebfbe0dcb50c3f4753a.tar.gz
scala-6a988aeff0f426480ce50ebfbe0dcb50c3f4753a.tar.bz2
scala-6a988aeff0f426480ce50ebfbe0dcb50c3f4753a.zip
Fixed a booch I made in io.Position's positioning.
Closes #4498, no review.
Diffstat (limited to 'src')
-rw-r--r--src/library/scala/io/Position.scala2
1 files changed, 1 insertions, 1 deletions
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. */