Reading and parsing CSV files

This is my first real attempt at a Scala program. I come from a predominantly Java background, so I'd like to know if the program sticks to Scala conventions well.

Is it well readable or should it be formulated differently? To me, there is a lot of lines in the main function which doesn't quite bode right.

It is functioning and I can provide my JUnit tests to prove it. Not all tests pass as those dealing with whitespace are now different.

I didn't want to use any parsing library or support as that doesn't help me learn the core of the language.

```
package com.wesleyacheson

import scala.io.Source
import scala.annotation.tailrec

class CSVReader2(source: Source) {

val QuoteChar = '"'
val LF = '\n'
val CR = '\r'
val Separator = ','

def readAll(lines:List[List[String]] = Nil):List[List[String]] = {
if (source.hasNext) {
return readAll(readLine()::lines)
}
return lines.reverse;
}

@tailrec final def readUntilQuote(buffered: AnyRef with BufferedIterator[Char], partial:String = ""):String = {
val char = buffered.next()
val next = if(buffered.hasNext) buffered.head else ""
(char, next) match {
case (QuoteChar, QuoteChar) => readUntilQuote(buffered, partial + buffered.next()) //We've read both charachters so skip
case (QuoteChar, _) => partial
case _ => readUntilQuote(buffered, partial + char)
}
}

def readLine():List[String] = {
val buffered = source.buffered
@tailrec def readLine(tokens:List[String] , partialToken:String):List[String] = {
val finished = {() => (partialToken::tokens).reverse}
if (!buffered.hasNext) return finished()
val char=buffered.next()
val subsequentChar = if (buffered.hasNext) buffered.head

(char, subsequentChar) match {
case (QuoteChar, x) if x != QuoteChar =>
readLine(tokens, partialToken + readUntilQuote(buffered))
case (QuoteChar, QuoteChar) =>
buffered.next();
readLine(tokens, partia

Here are a few things, going from smallest to the more significant.

• Try to avoid using return. It isn't idiomatic, and for good reason. So instead of writing if (cond) return a; return b you should prefer if (cond) a else b

• Unless I'm missing anything, in readUntilQuote's signature buffered should be of type BufferedIterator[Char] instead of AnyRef with BufferedIterator[Char]. The AnyRef there doesn't do anything useful.

• You can use Source and still have functional code. Specifically, try looking at Source.getLines(). It returns an Iterator[String] that is lazily-evaluated but can still be used functionally almost like other collections (you can map, fold, filter, etc.)

StackExchange Code Review Q#27206, answer score: 2