Apache
/
commons-csv
mirror of https://github.com/apache/commons-csv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

CSV-70 Improve readability of CSVLexer 

Simplify; remove while(true) loop

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1306079 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastian Bazley 2012-03-28 00:34:27 +00:00
parent 7c2cfeaf58
commit ba26844c7b
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/java/org/apache/commons/csv/CSVLexer.java
View File

@ -133,27 +133,21 @@ class CSVLexer extends Lexer {
* @throws IOException on stream access error
*/
private Token simpleTokenLexer(Token tkn, int c) throws IOException {
while (true) {
while (tkn.type == INVALID) {
if (isEndOfLine(c)) {
// end of record
tkn.type = EORECORD;
break;
} else if (isEndOfFile(c)) {
// end of file
tkn.type = EOF;
tkn.isReady = true; // There is data at EOF
break;
} else if (isDelimiter(c)) {
// end of token
tkn.type = TOKEN;
break;
} else if (isEscape(c)) {
tkn.content.append((char) readEscape());
c = in.read(); // continue
} else {
tkn.content.append((char) c);
c = in.read(); // continue
}
c = in.read();
}
if (surroundingSpacesIgnored) {