Author: sebb
Date: Wed Mar 28 00:01:43 2012
New Revision: 1306064
URL: http://svn.apache.org/viewvc?rev=1306064&view=rev
Log:
CSV-70 Improve readability of CSVLexer
Introduce COMMENT type
Modified:
commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVLexer.java
commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVParser.java
commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/Token.java
commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexerTest.java
Modified:
commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVLexer.java
URL:
http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVLexer.java?rev=1306064&r1=1306063&r2=1306064&view=diff
==============================================================================
--- commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVLexer.java
(original)
+++ commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVLexer.java
Wed Mar 28 00:01:43 2012
@@ -92,7 +92,7 @@ class CSVLexer extends Lexer {
if (isCommentStart(c)) { // TODO should only match at start of line
// ignore everything till end of line and continue (incr
linecount)
in.readLine();
- tkn = nextToken(tkn.reset());
+ tkn.type = COMMENT;
} else if (isDelimiter(c)) {
// empty token return TOKEN("")
tkn.type = TOKEN;
Modified:
commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVParser.java
URL:
http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVParser.java?rev=1306064&r1=1306063&r2=1306064&view=diff
==============================================================================
---
commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVParser.java
(original)
+++
commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/CSVParser.java
Wed Mar 28 00:01:43 2012
@@ -154,6 +154,8 @@ public class CSVParser implements Iterab
break;
case INVALID:
throw new IOException("(line " + getLineNumber() + ")
invalid parse sequence");
+ case COMMENT: // Ignored currently
+ break;
}
} while (reusableToken.type == TOKEN);
Modified:
commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/Token.java
URL:
http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/Token.java?rev=1306064&r1=1306063&r2=1306064&view=diff
==============================================================================
--- commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/Token.java
(original)
+++ commons/proper/csv/trunk/src/main/java/org/apache/commons/csv/Token.java
Wed Mar 28 00:01:43 2012
@@ -41,7 +41,10 @@ class Token {
EOF,
/** Token with content when end of a line is reached. */
- EORECORD
+ EORECORD,
+
+ /** Token is a comment line */
+ COMMENT
}
/** Token type */
Modified:
commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexerTest.java
URL:
http://svn.apache.org/viewvc/commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexerTest.java?rev=1306064&r1=1306063&r2=1306064&view=diff
==============================================================================
---
commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexerTest.java
(original)
+++
commons/proper/csv/trunk/src/test/java/org/apache/commons/csv/CSVLexerTest.java
Wed Mar 28 00:01:43 2012
@@ -76,6 +76,7 @@ public class CSVLexerTest {
assertTokenEquals(TOKEN, "a", parser.nextToken(new Token()));
assertTokenEquals(TOKEN, "b x", parser.nextToken(new Token()));
assertTokenEquals(EORECORD, "c", parser.nextToken(new Token()));
+ assertTokenEquals(COMMENT, "", parser.nextToken(new Token()));
assertTokenEquals(EORECORD, "", parser.nextToken(new Token()));
assertTokenEquals(TOKEN, "d", parser.nextToken(new Token()));
assertTokenEquals(TOKEN, "e", parser.nextToken(new Token()));
