Skip to content

[pull] master from apache:master #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Mar 6, 2021
Merged

[pull] master from apache:master #25

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions src/main/java/org/apache/commons/csv/Lexer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,14 +300,17 @@ private Token parseEncapsulatedToken(final Token token) throws IOException {
if (isDelimiter(c)) {
token.type = TOKEN;
return token;
} else if (isEndOfFile(c)) {
}
if (isEndOfFile(c)) {
token.type = EOF;
token.isReady = true; // There is data at EOF
return token;
} else if (readEndOfLine(c)) {
}
if (readEndOfLine(c)) {
token.type = EORECORD;
return token;
} else if (!isWhitespace(c)) {
}
if (!isWhitespace(c)) {
// error invalid char between token and next delimiter
throw new IOException("(line " + getCurrentLineNumber() +
") invalid char between encapsulated token and delimiter");
Expand Down Expand Up @@ -350,14 +353,17 @@ private Token parseSimpleToken(final Token token, int ch) throws IOException {
if (readEndOfLine(ch)) {
token.type = EORECORD;
break;
} else if (isEndOfFile(ch)) {
}
if (isEndOfFile(ch)) {
token.type = EOF;
token.isReady = true; // There is data at EOF
break;
} else if (isDelimiter(ch)) {
}
if (isDelimiter(ch)) {
token.type = TOKEN;
break;
} else if (isEscape(ch)) {
}
if (isEscape(ch)) {
final int unescaped = readEscape();
if (unescaped == END_OF_STREAM) { // unexpected char after escape
token.content.append((char) ch).append((char) reader.getLastChar());
Expand Down