commit 572a65110d9ca3c9d3bf2151fe23869e211d22ec
author Tatu Saloranta <tatu.saloranta@iki.fi> Thu May 01 10:25:48 2014 -0700
committer Tatu Saloranta <tatu.saloranta@iki.fi> Thu May 01 10:25:48 2014 -0700
tree 2ea6b449eefc6b29db3dd40e3b1c79587fc49beb
parent ea1fd86638ccaff3b707c508dd95b3b696bd6b11

cleanup for ws handling

src/main/java/com/fasterxml/jackson/core/json/UTF8StreamJsonParser.java

diff --git a/src/main/java/com/fasterxml/jackson/core/json/UTF8StreamJsonParser.java b/src/main/java/com/fasterxml/jackson/core/json/UTF8StreamJsonParser.java
index c5ea69a..0922411 100644
--- a/src/main/java/com/fasterxml/jackson/core/json/UTF8StreamJsonParser.java
+++ b/src/main/java/com/fasterxml/jackson/core/json/UTF8StreamJsonParser.java
@@ -31,7 +31,7 @@
     protected final static int[] _icLatin1 = CharTypes.getInputCodeLatin1();
 
     // White-space processing is done all the time, pre-fetch as well
-    private final static int[] _icWS = CharTypes.getInputCodeWS();
+//    private final static int[] _icWS = CharTypes.getInputCodeWS();
     
     /*
     /**********************************************************
@@ -2649,26 +2649,17 @@
     {
         while (_inputPtr < _inputEnd || loadMore()) {
             int i = _inputBuffer[_inputPtr++] & 0xFF;
-            switch (i) {
-            case ' ':
-            case '\t':
-                break;
-            case INT_CR:
-                _skipCR();
-                break;
-            case INT_LF:
-                ++_currInputRow;
-                _currInputRowStart = _inputPtr;
-                break;
-            case INT_SLASH:
-                _skipComment();
-                break;
-            case '#':
-                if (!_skipYAMLComment()) {
-                    return i;
+
+            if (i > INT_SPACE) {
+                if (i == INT_SLASH) {
+                    _skipComment();
+                    continue;
                 }
-                break;
-            default:
+                if (i == INT_HASH) {
+                    if (_skipYAMLComment()) {
+                        continue;
+                    }
+                }
                 if (gotColon) {
                     return i;
                 }
@@ -2679,6 +2670,15 @@
                     _reportUnexpectedChar(i, "was expecting a colon to separate field name and value");
                 }
                 gotColon = true;
+            } else if (i != INT_SPACE) {
+                if (i == INT_LF) {
+                    ++_currInputRow;
+                    _currInputRowStart = _inputPtr;
+                } else if (i == INT_CR) {
+                    _skipCR();
+                } else if (i != INT_TAB) {
+                    _throwInvalidSpace(i);
+                }
             }
         }
         throw _constructError("Unexpected end-of-input within/between "+_parsingContext.getTypeDesc()+" entries");