CSV-70 Improve readability of CSVLexer

Remove unnecessary parameters

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

Author: sebbASF

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

@@ -89,7 +89,7 @@ Token nextToken(Token tkn) throws IOException {
             }
 
             // ok, start of token reached: comment, encapsulated, or token
-            if (isCommentStart(c)) {
+            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());
@@ -102,7 +102,7 @@ Token nextToken(Token tkn) throws IOException {
                 tkn.type = EORECORD;
             } else if (isEncapsulator(c)) {
                 // consume encapsulated token
-                encapsulatedTokenLexer(tkn, c);
+                encapsulatedTokenLexer(tkn);
             } else if (isEndOfFile(c)) {
                 // end of file return EOF()
                 //noop: tkn.content.append("");
@@ -150,7 +150,7 @@ private Token simpleTokenLexer(Token tkn, int c) throws IOException {
                 tkn.type = TOKEN;
                 break;
             } else if (isEscape(c)) {
-                tkn.content.append((char) readEscape(c));
+                tkn.content.append((char) readEscape());
             } else {
                 tkn.content.append((char) c);
             }
@@ -174,20 +174,20 @@ private Token simpleTokenLexer(Token tkn, int c) throws IOException {
      * Whitespaces before and after an encapsulated token are ignored.
      *
      * @param tkn the current token
-     * @param c   the current character
      * @return a valid token object
      * @throws IOException on invalid state
      */
-    private Token encapsulatedTokenLexer(Token tkn, int c) throws IOException {
+    private Token encapsulatedTokenLexer(Token tkn) throws IOException {
         // save current line
         int startLineNumber = getLineNumber();
         // ignore the given delimiter
         // assert c == delimiter;
+        int c;
         while (true) {
             c = in.read();
 
             if (isEscape(c)) {
-                tkn.content.append((char) readEscape(c));
+                tkn.content.append((char) readEscape());
             } else if (isEncapsulator(c)) {
                 if (isEncapsulator(in.lookAhead())) {
                     // double or escaped encapsulator -> add single encapsulator to token

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

@@ -60,9 +60,9 @@ int getLineNumber() {
         return in.getLineNumber();
     }
 
-    int readEscape(int c) throws IOException {
+    int readEscape() throws IOException {
         // assume c is the escape char (normally a backslash)
-        c = in.read();
+        int c = in.read();
         switch (c) {
             case 'r':
                 return '\r';

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

@@ -159,7 +159,7 @@ private Token simpleTokenLexer(Token tkn, int c) throws IOException {
                 tkn.isReady = true;
                 break;
             } else if (c == format.getEscape()) {
-                tkn.content.append((char) readEscape(c));
+                tkn.content.append((char) readEscape());
             } else {
                 tkn.content.append((char) c);
             }
@@ -196,7 +196,7 @@ private Token encapsulatedTokenLexer(Token tkn, int c) throws IOException {
             c = in.read();
 
             if (c == format.getEscape()) {
-                tkn.content.append((char) readEscape(c));
+                tkn.content.append((char) readEscape());
             } else if (c == format.getEncapsulator()) {
                 if (in.lookAhead() == format.getEncapsulator()) {
                     // double or escaped encapsulator -> add single encapsulator to token