CSV-70 Improve readability of CSVLexer

Introduce COMMENT type

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/csv/trunk@1306064 13f79535-47bb-0310-9956-ffa450edef68

Author: sebbASF

src/main/java/org/apache/commons/csv/CSVLexer.java

@@ -92,7 +92,7 @@ Token nextToken(Token tkn) throws IOException {
             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;

src/main/java/org/apache/commons/csv/CSVParser.java

@@ -154,6 +154,8 @@ CSVRecord getRecord() throws IOException {
                     break;
                 case INVALID:
                     throw new IOException("(line " + getLineNumber() + ") invalid parse sequence");
+                case COMMENT: // Ignored currently
+                    break;
             }
         } while (reusableToken.type == TOKEN);
 

src/main/java/org/apache/commons/csv/Token.java

@@ -41,7 +41,10 @@ enum Type {
         EOF,
 
         /** Token with content when end of a line is reached. */
-        EORECORD
+        EORECORD,
+        
+        /** Token is a comment line */
+        COMMENT
     }
 
     /** Token type */

src/test/java/org/apache/commons/csv/CSVLexerTest.java

@@ -76,6 +76,7 @@ public void testNextToken2() throws IOException {
         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()));