Adds a serializing option to backslash escape forward slashes. This is for issue johnezang#21.

johnezang · johnezang · commit b8359c61d824 · 2011-05-02T15:11:41.000-04:00
diff --git a/JSONKit.h b/JSONKit.h
@@ -126,10 +126,11 @@ enum {
 typedef JKFlags JKParseOptionFlags;
 
 enum {
-  JKSerializeOptionNone           = 0,
-  JKSerializeOptionPretty         = (1 << 0),
-  JKSerializeOptionEscapeUnicode  = (1 << 1),
-  JKSerializeOptionValidFlags     = (JKSerializeOptionPretty | JKSerializeOptionEscapeUnicode),
+  JKSerializeOptionNone                 = 0,
+  JKSerializeOptionPretty               = (1 << 0),
+  JKSerializeOptionEscapeUnicode        = (1 << 1),
+  JKSerializeOptionEscapeForwardSlashes = (1 << 4),
+  JKSerializeOptionValidFlags           = (JKSerializeOptionPretty | JKSerializeOptionEscapeUnicode | JKSerializeOptionEscapeForwardSlashes),
 };
 typedef JKFlags JKSerializeOptionFlags;
 
diff --git a/JSONKit.m b/JSONKit.m
@@ -2604,7 +2604,7 @@ static int jk_encode_add_atom_to_buffer(JKEncodeState *encodeState, void *object
                   default: if(JK_EXPECT_F(jk_encode_printf(encodeState, NULL, 0UL, NULL, "\\u%4.4x", utf8String[utf8Idx]))) { return(1); } break;
                 }
               } else {
-                if(JK_EXPECT_F(utf8String[utf8Idx] == '\"') || JK_EXPECT_F(utf8String[utf8Idx] == '\\')) { encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; }
+                if(JK_EXPECT_F(utf8String[utf8Idx] == '\"') || JK_EXPECT_F(utf8String[utf8Idx] == '\\') || (JK_EXPECT_F(encodeState->serializeOptionFlags & JKSerializeOptionEscapeForwardSlashes) && JK_EXPECT_F(utf8String[utf8Idx] == '/'))) { encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; }
                 encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = utf8String[utf8Idx];
               }
             }
@@ -2658,7 +2658,7 @@ static int jk_encode_add_atom_to_buffer(JKEncodeState *encodeState, void *object
                   else                              { if(JK_EXPECT_F(jk_encode_printf(encodeState, NULL, 0UL, NULL, "\\u%4.4x\\u%4.4x", (0xd7c0U + (u32ch >> 10)), (0xdc00U + (u32ch & 0x3ffU))))) { return(1); } }
                 }
               } else {
-                if(JK_EXPECT_F(utf8String[utf8Idx] == '\"') || JK_EXPECT_F(utf8String[utf8Idx] == '\\')) { encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; }
+                if(JK_EXPECT_F(utf8String[utf8Idx] == '\"') || JK_EXPECT_F(utf8String[utf8Idx] == '\\') || (JK_EXPECT_F(encodeState->serializeOptionFlags & JKSerializeOptionEscapeForwardSlashes) && JK_EXPECT_F(utf8String[utf8Idx] == '/'))) { encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; }
                 encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = utf8String[utf8Idx];
               }
             }

Original file line number	Diff line number	Diff line change
`@@ -2604,7 +2604,7 @@ static int jk_encode_add_atom_to_buffer(JKEncodeState encodeState, void object`
`2604`	`2604`	`default: if(JK_EXPECT_F(jk_encode_printf(encodeState, NULL, 0UL, NULL, "\\u%4.4x", utf8String[utf8Idx]))) { return(1); } break;`
`2605`	`2605`	`}`
`2606`	`2606`	`} else {`
`2607`		`- if(JK_EXPECT_F(utf8String[utf8Idx] == '\"') \|\| JK_EXPECT_F(utf8String[utf8Idx] == '\\')) { encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; }`
	`2607`	`+ if(JK_EXPECT_F(utf8String[utf8Idx] == '\"') \|\| JK_EXPECT_F(utf8String[utf8Idx] == '\\') \|\| (JK_EXPECT_F(encodeState->serializeOptionFlags & JKSerializeOptionEscapeForwardSlashes) && JK_EXPECT_F(utf8String[utf8Idx] == '/'))) { encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; }`
`2608`	`2608`	`encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = utf8String[utf8Idx];`
`2609`	`2609`	`}`
`2610`	`2610`	`}`
`@@ -2658,7 +2658,7 @@ static int jk_encode_add_atom_to_buffer(JKEncodeState encodeState, void object`
`2658`	`2658`	`else { if(JK_EXPECT_F(jk_encode_printf(encodeState, NULL, 0UL, NULL, "\\u%4.4x\\u%4.4x", (0xd7c0U + (u32ch >> 10)), (0xdc00U + (u32ch & 0x3ffU))))) { return(1); } }`
`2659`	`2659`	`}`
`2660`	`2660`	`} else {`
`2661`		`- if(JK_EXPECT_F(utf8String[utf8Idx] == '\"') \|\| JK_EXPECT_F(utf8String[utf8Idx] == '\\')) { encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; }`
	`2661`	`+ if(JK_EXPECT_F(utf8String[utf8Idx] == '\"') \|\| JK_EXPECT_F(utf8String[utf8Idx] == '\\') \|\| (JK_EXPECT_F(encodeState->serializeOptionFlags & JKSerializeOptionEscapeForwardSlashes) && JK_EXPECT_F(utf8String[utf8Idx] == '/'))) { encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = '\\'; }`
`2662`	`2662`	`encodeState->stringBuffer.bytes.ptr[encodeState->atIndex++] = utf8String[utf8Idx];`
`2663`	`2663`	`}`
`2664`	`2664`	`}`