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 methods from Lexer parent class

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1303904 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Sebastian Bazley 2012-03-22 17:27:51 +00:00
parent ff41f78ef5
commit 83e4a903b1
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -91,11 +91,11 @@ class CSVLexer extends Lexer {
} }
// ok, start of token reached: comment, encapsulated, or token // ok, start of token reached: comment, encapsulated, or token
if (c == format.getCommentStart()) { if (isCommentStart(c)) {
// ignore everything till end of line and continue (incr linecount) // ignore everything till end of line and continue (incr linecount)
in.readLine(); in.readLine();
tkn = nextToken(tkn.reset()); tkn = nextToken(tkn.reset());
} else if (c == format.getDelimiter()) { } else if (isDelimiter(c)) {
// empty token return TOKEN("") // empty token return TOKEN("")
tkn.type = TOKEN; tkn.type = TOKEN;
tkn.isReady = true; tkn.isReady = true;
@ -104,7 +104,7 @@ class CSVLexer extends Lexer {
//noop: tkn.content.append(""); //noop: tkn.content.append("");
tkn.type = EORECORD; tkn.type = EORECORD;
tkn.isReady = true; tkn.isReady = true;
} else if (c == format.getEncapsulator()) { } else if (isEncapsulator(c)) {
// consume encapsulated token // consume encapsulated token
encapsulatedTokenLexer(tkn, c); encapsulatedTokenLexer(tkn, c);
} else if (isEndOfFile(c)) { } else if (isEndOfFile(c)) {
@ -153,12 +153,12 @@ class CSVLexer extends Lexer {
tkn.type = EOF; tkn.type = EOF;
tkn.isReady = true; tkn.isReady = true;
break; break;
} else if (c == format.getDelimiter()) { } else if (isDelimiter(c)) {
// end of token // end of token
tkn.type = TOKEN; tkn.type = TOKEN;
tkn.isReady = true; tkn.isReady = true;
break; break;
} else if (c == format.getEscape()) { } else if (isEscape(c)) {
tkn.content.append((char) readEscape(c)); tkn.content.append((char) readEscape(c));
} else { } else {
tkn.content.append((char) c); tkn.content.append((char) c);
@ -195,10 +195,10 @@ class CSVLexer extends Lexer {
while (true) { while (true) {
c = in.read(); c = in.read();
if (c == format.getEscape()) { if (isEscape(c)) {
tkn.content.append((char) readEscape(c)); tkn.content.append((char) readEscape(c));
} else if (c == format.getEncapsulator()) { } else if (isEncapsulator(c)) {
if (in.lookAhead() == format.getEncapsulator()) { if (isEncapsulator(in.lookAhead())) {
// double or escaped encapsulator -> add single encapsulator to token // double or escaped encapsulator -> add single encapsulator to token
c = in.read(); c = in.read();
tkn.content.append((char) c); tkn.content.append((char) c);
@ -206,7 +206,7 @@ class CSVLexer extends Lexer {
// token finish mark (encapsulator) reached: ignore whitespace till delimiter // token finish mark (encapsulator) reached: ignore whitespace till delimiter
while (true) { while (true) {
c = in.read(); c = in.read();
if (c == format.getDelimiter()) { if (isDelimiter(c)) {
tkn.type = TOKEN; tkn.type = TOKEN;
tkn.isReady = true; tkn.isReady = true;
return tkn; return tkn;