Merge branch 'master' of github.com:couchdeveloper/JPJson

couchdeveloper · Sep 17, 2012 · 12f2380 · 12f2380
2 parents 4eec3d1 + b22db03
commit 12f2380
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 16 deletions.
diff --git a/Libraries/iOS Libraries/JPJson iOS Libraries.xcodeproj/project.pbxproj b/Libraries/iOS Libraries/JPJson iOS Libraries.xcodeproj/project.pbxproj
@@ -209,7 +209,7 @@
 		A16AEB271441FB0300FDB7B2 /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0430;
+				LastUpgradeCheck = 0440;
 			};
 			buildConfigurationList = A16AEB2A1441FB0300FDB7B2 /* Build configuration list for PBXProject "JPJson iOS Libraries" */;
 			compatibilityVersion = "Xcode 3.2";

diff --git a/...es/iOS Libraries/JPJson iOS Libraries.xcodeproj/xcshareddata/xcschemes/JPJsonLib.xcscheme b/...es/iOS Libraries/JPJson iOS Libraries.xcodeproj/xcshareddata/xcschemes/JPJsonLib.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0450"
+   LastUpgradeVersion = "0440"
    version = "1.7">
    <BuildAction
       parallelizeBuildables = "NO"

diff --git a/Source/json/ObjC/JPSemanticActionsProtocol.h b/Source/json/ObjC/JPSemanticActionsProtocol.h
@@ -58,22 +58,36 @@
  JSON Strings (which inlcude keys) will be unescaped by the parser.
  
  
- A typical flow of messages could be as follows:
+ Below is a typical flow of the complete messages:
  
     parserFoundArrayBegin
         parserFoundObjectBegin
-            parserFoundKeyValuePairBeginWithKey
+            parserFoundKeyValuePairBeginWithKey:length:encoding:index:
                 parserFoundJsonArrayBegin
-                    parserFoundJsonString
-                    parserFoundJsonString
-                    .. 
+                    parserFoundValueBeginAtIndex:
+                    parserFoundString:length:hasMore:encoding:
+                    parserFoundString:length:hasMore:encoding:
+                    parserFoundString:length:hasMore:encoding:
+                    parserFoundValueEndAtIndex:
+
+                    parserFoundValueBeginAtIndex:
+                    parserFoundString:length:hasMore:encoding:
+                    parserFoundValueEndAtIndex:
+                    
+                    ...
+ 
                 parserFoundJsonArrayEnd
             parserFoundKeyValuePairEnd
  
-            parserFoundKeyValuePairBeginWithKey
+            parserFoundKeyValuePairBeginWithKey:length:encoding:index:
                 parserFoundJsonArrayBegin
-                    parserFoundJsonString
-                    parserFoundJsonString
+                    parserFoundValueBeginAtIndex:
+                    parserFoundNumber:length:
+                    parserFoundValueEndAtIndex:
+                     
+                    parserFoundValueBeginAtIndex:
+                    parserFoundNumber:length:
+                    parserFoundValueEndAtIndex:
                     ..
                 parserFoundJsonArrayEnd
             parserFoundKeyValuePairEnd
@@ -145,10 +159,10 @@
  
  The four methods
  
- - `-parserFoundJsonValueBeginAtIndex:`,
- - `-parserFoundJsonValueEndAtIndex:`, 
- - `-parserFoundJsonValueBeginWithKey:length:encoding:index` and
- - `-parserFoundJsonValueEndWithKey:length:encoding:index`
+ - `-parserFoundValueBeginAtIndex:`,
+ - `-parserFoundValueEndAtIndex:`, 
+ - `-parserFoundValueBeginWithKey:length:encoding:index` and
+ - `-parserFoundValueEndWithKey:length:encoding:index`
  
  are helpful when implementing a streaming API. These additional messages 
  give fine grained control for all relevant parser events.
@@ -341,8 +355,8 @@
  Sent to the delegate when the parser found the end of a JSON Value 
  belonging to an JSON Array at the specified index.
  
- The associated value at this index has been notified by the parser by the corres-
- ponding event which has been sent immediately before this message.
+ The associated value at this index has been notified by the parser by the 
+ corresponding event which has been sent immediately before this message.
  
  @param index The index of at which the value is added to the JSON Array.
  */