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

CSV-71 - Add convenience Methods to CSVLexer 

Use convenience fields from Lexer parent class; missed one method replacement earlier

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1303933 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastian Bazley 2012-03-22 18:00:43 +00:00
parent 523171ed41
commit fa07dea585
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

@ -56,7 +56,7 @@ class CSVLexer extends Lexer {
c = in.readAgain(); c = in.readAgain();
// empty line detection: eol AND (last char was EOL or beginning) // empty line detection: eol AND (last char was EOL or beginning)
if (format.isEmptyLinesIgnored()) { if (emptyLinesIgnored) {
while (eol while (eol
&& (lastChar == '\n' || lastChar == '\r' || lastChar == ExtendedBufferedReader.UNDEFINED) && (lastChar == '\n' || lastChar == '\r' || lastChar == ExtendedBufferedReader.UNDEFINED)
&& !isEndOfFile(lastChar)) { && !isEndOfFile(lastChar)) {
@ -74,7 +74,7 @@ class CSVLexer extends Lexer {
} }
// did we reach eof during the last iteration already ? EOF // did we reach eof during the last iteration already ? EOF
if (isEndOfFile(lastChar) || (lastChar != format.getDelimiter() && isEndOfFile(c))) { if (isEndOfFile(lastChar) || (isDelimiter(lastChar) && isEndOfFile(c))) {
tkn.type = EOF; tkn.type = EOF;
return tkn; return tkn;
} }
@ -82,7 +82,7 @@ class CSVLexer extends Lexer {
// important: make sure a new char gets consumed in each iteration // important: make sure a new char gets consumed in each iteration
while (!tkn.isReady && tkn.type != EOF) { while (!tkn.isReady && tkn.type != EOF) {
// ignore whitespaces at beginning of a token // ignore whitespaces at beginning of a token
if (format.isLeadingSpacesIgnored()) { if (leadingSpacesIgnored) {
while (isWhitespace(c) && !eol) { while (isWhitespace(c) && !eol) {
wsBuf.append((char) c); wsBuf.append((char) c);
c = in.read(); c = in.read();
@ -115,7 +115,7 @@ class CSVLexer extends Lexer {
} else { } else {
// next token must be a simple token // next token must be a simple token
// add removed blanks when not ignoring whitespace chars... // add removed blanks when not ignoring whitespace chars...
if (!format.isLeadingSpacesIgnored()) { if (!leadingSpacesIgnored) {
tkn.content.append(wsBuf); tkn.content.append(wsBuf);
} }
simpleTokenLexer(tkn, c); simpleTokenLexer(tkn, c);
@ -167,7 +167,7 @@ class CSVLexer extends Lexer {
c = in.read(); c = in.read();
} }
if (format.isTrailingSpacesIgnored()) { if (trailingSpacesIgnored) {
trimTrailingSpaces(tkn.content); trimTrailingSpaces(tkn.content);
} }