commit 05f25551f2fa7705268105f3b94731aaf87f341a
author cowtowncoder <cowtowncoder@cc757fca-8a48-0410-80b4-e22f7f27f4c6> Mon Jul 25 21:21:40 2011 +0000
committer cowtowncoder <cowtowncoder@cc757fca-8a48-0410-80b4-e22f7f27f4c6> Mon Jul 25 21:21:40 2011 +0000
tree 504b4f2a60e4d7e14e6acbb88d71a78f7a30b7a8
parent 6a916010b3b0b7d3113184f0e65a31ade4c9f4ef

Minor improvements to verified

src/tools/VerifySmileDocs.java

diff --git a/src/tools/VerifySmileDocs.java b/src/tools/VerifySmileDocs.java
index b79e336..20bbd5f 100644
--- a/src/tools/VerifySmileDocs.java
+++ b/src/tools/VerifySmileDocs.java
@@ -96,8 +96,35 @@
 
         while ((t1 = jsonParser.nextToken()) != null) {
             JsonToken t2 = smileParser.nextToken();
+            // first: token types must match
             if (t1 != t2) {
-                smileParser.close();
+                return jsonParser;
+            }
+            // and second, values as well
+            switch (t1) {
+            case VALUE_STRING:
+            case FIELD_NAME:
+                if (!jsonParser.getText().equals(smileParser.getText())) {
+                    return jsonParser;
+                }
+                break;
+            case VALUE_NUMBER_INT:
+                if (jsonParser.getLongValue() != smileParser.getLongValue()) {
+                    return jsonParser;
+                }
+                break;
+            case VALUE_NUMBER_FLOAT:
+                if (jsonParser.getDoubleValue() != smileParser.getDoubleValue()) {
+                    return jsonParser;
+                }
+                break;
+            // others are fine:
+            // Boolean values are distinct tokens;
+            // Object/Array start/end likewise
+            }
+        }
+        if (t1 == null) {
+            if (smileParser.nextToken() != null) {
                 return jsonParser;
             }
         }