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

CSV-283: Remove Whitespace Check Determines Delimiter Twice (#167)

This commit is contained in:
belugabehr 2021-07-13 20:16:59 -04:00 committed by GitHub
parent dced5f77fe
commit d617b6720a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/org/apache/commons/csv/Lexer.java
View File

@ -193,16 +193,6 @@ final class Lexer implements Closeable {
return ch == LF || ch == CR || ch == UNDEFINED;
}
/**
* Tests if the given char is a whitespace character.
*
* @return true if the given char is a whitespace character.
* @throws IOException If an I/O error occurs.
*/
boolean isWhitespace(final int ch) throws IOException {
return !isDelimiter(ch) && Character.isWhitespace((char) ch);
}
private char mapNullToDisabled(final Character c) {
return c == null ? DISABLED : c.charValue();
}
@ -271,7 +261,7 @@ final class Lexer implements Closeable {
while (token.type == INVALID) {
// ignore whitespaces at beginning of a token
if (ignoreSurroundingSpaces) {
while (isWhitespace(c) && !eol) {
while (Character.isWhitespace((char)c) && !isDelimiter(c) && !eol) {
c = reader.read();
eol = readEndOfLine(c);
}
@ -364,7 +354,7 @@ final class Lexer implements Closeable {
token.type = EORECORD;
return token;
}
if (!isWhitespace(c)) {
if (!Character.isWhitespace((char)c)) {
// error invalid char between token and next delimiter
throw new IOException("(line " + getCurrentLineNumber() +
") invalid char between encapsulated token and delimiter");