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

Rename method from "is" prefix to "read" prefix because it is not just a test method, it may actually consume input. 

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1397923 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary D. Gregory 2012-10-13 18:56:57 +00:00
parent 0f8cc2228c
commit 2a8ce4a11c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,7 @@ final class CSVLexer extends Lexer {
* Note: The following call will swallow LF if c == CR. But we don't need to know if the last char was CR or LF * Note: The following call will swallow LF if c == CR. But we don't need to know if the last char was CR or LF
* - they are equivalent here. * - they are equivalent here.
*/ */
boolean eol = isEndOfLine(c); boolean eol = readEndOfLine(c);
// empty line detection: eol AND (last char was EOL or beginning) // empty line detection: eol AND (last char was EOL or beginning)
if (ignoreEmptyLines) { if (ignoreEmptyLines) {
@ -63,7 +63,7 @@ final class CSVLexer extends Lexer {
// go on char ahead ... // go on char ahead ...
lastChar = c; lastChar = c;
c = in.read(); c = in.read();
eol = isEndOfLine(c); eol = readEndOfLine(c);
// reached end of file without any content (empty line at the end) // reached end of file without any content (empty line at the end)
if (isEndOfFile(c)) { if (isEndOfFile(c)) {
token.type = EOF; token.type = EOF;
@ -93,7 +93,7 @@ final class CSVLexer extends Lexer {
if (ignoreSurroundingSpaces) { if (ignoreSurroundingSpaces) {
while (isWhitespace(c) && !eol) { while (isWhitespace(c) && !eol) {
c = in.read(); c = in.read();
eol = isEndOfLine(c); eol = readEndOfLine(c);
} }
} }
@ -144,7 +144,7 @@ final class CSVLexer extends Lexer {
private Token simpleTokenLexer(final Token tkn, int c) throws IOException { private Token simpleTokenLexer(final Token tkn, int c) throws IOException {
// Faster to use while(true)+break than while(tkn.type == INVALID) // Faster to use while(true)+break than while(tkn.type == INVALID)
while (true) { while (true) {
if (isEndOfLine(c)) { if (readEndOfLine(c)) {
tkn.type = EORECORD; tkn.type = EORECORD;
break; break;
} else if (isEndOfFile(c)) { } else if (isEndOfFile(c)) {
@ -215,7 +215,7 @@ final class CSVLexer extends Lexer {
tkn.type = EOF; tkn.type = EOF;
tkn.isReady = true; // There is data at EOF tkn.isReady = true; // There is data at EOF
return tkn; return tkn;
} else if (isEndOfLine(c)) { } else if (readEndOfLine(c)) {
tkn.type = EORECORD; tkn.type = EORECORD;
return tkn; return tkn;
} else if (!isWhitespace(c)) { } else if (!isWhitespace(c)) {