diff options
| author | Paul Phillips <paulp@improving.org> | 2009-04-30 22:38:36 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2009-04-30 22:38:36 +0000 |
| commit | 255c136db6906c586ce945f8a13b8daa5bf872d3 (patch) | |
| tree | d3b950f7f321c4da46b443ba9fa8dca979e4a751 | |
| parent | 8be38d4395c649746b46f6f10748fd561a672472 (diff) | |
| download | scala-255c136db6906c586ce945f8a13b8daa5bf872d3.tar.gz scala-255c136db6906c586ce945f8a13b8daa5bf872d3.tar.bz2 scala-255c136db6906c586ce945f8a13b8daa5bf872d3.zip | |
Fix and test for #1937
| -rw-r--r-- | src/compiler/scala/tools/nsc/util/CharArrayReader.scala | 2 | ||||
| -rw-r--r-- | test/files/pos/t1937/NumberGenerator.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/util/CharArrayReader.scala b/src/compiler/scala/tools/nsc/util/CharArrayReader.scala index ac1b37cb48..a6c10520bb 100644 --- a/src/compiler/scala/tools/nsc/util/CharArrayReader.scala +++ b/src/compiler/scala/tools/nsc/util/CharArrayReader.scala @@ -75,7 +75,7 @@ class CharArrayReader(buf: RandomAccessSeq[Char], start: Int, /* startline: int, case '\t' => // nextcol = ((nextcol - 1) / tabinc * tabinc) + tabinc + 1; case CR => - if (buf(bp) == LF) { + if (bp < buf.size && buf(bp) == LF) { ch = LF bp += 1 } diff --git a/test/files/pos/t1937/NumberGenerator.java b/test/files/pos/t1937/NumberGenerator.java new file mode 100644 index 0000000000..2f85e87bcc --- /dev/null +++ b/test/files/pos/t1937/NumberGenerator.java @@ -0,0 +1 @@ +package br.com.caelum.caelumweb2.money;
public class NumberGenerator {
public String generate() {
return null;
}
}
\ No newline at end of file |