Merge branch 'master' of git@github.com:280north/cappuccino

Foundation/CPString.j

@@ -23,6 +23,7 @@
 @import "CPObject.j"
 @import "CPException.j"
 @import "CPSortDescriptor.j"
+@import "CPValue.j"
 
 
 /*!
@@ -640,4 +641,24 @@ var CPStringHashes      = new objj_dictionary();
 @end
 
 
+@implementation CPString (JSON)
+
+/*!
+    Returns a string representing the supplied JavaScript object encoded as JSON.
+*/
++ (CPString)JSONFromObject:(JSObject)anObject
+{
+    return CPJSObjectCreateJSON(anObject);
+}
+
+/*!
+    Returns a JavaScript object decoded from the string's JSON representation.
+*/
+- (JSObject)objectFromJSON
+{
+    return CPJSObjectCreateWithJSON(self);
+}
+
+@end
+
 String.prototype.isa = CPString;