diff options
author | Johannes Rudolph <johannes.rudolph@gmail.com> | 2014-03-12 13:12:25 +0100 |
---|---|---|
committer | Johannes Rudolph <johannes.rudolph@gmail.com> | 2014-03-12 13:12:25 +0100 |
commit | 3180cfafbaa91ada879a3bd7e1be6f3064c14cc5 (patch) | |
tree | 9ad6a29edae9531254df9bdb27b1926a604708b5 /src/main/scala/spray/json/JsonPrinter.scala | |
parent | 615f60aa6e8e9481ada227bc0a6db76ba8c34920 (diff) | |
download | spray-json-3180cfafbaa91ada879a3bd7e1be6f3064c14cc5.tar.gz spray-json-3180cfafbaa91ada879a3bd7e1be6f3064c14cc5.tar.bz2 spray-json-3180cfafbaa91ada879a3bd7e1be6f3064c14cc5.zip |
match spec tightly about which characters to encode, fixes #83, #46
Diffstat (limited to 'src/main/scala/spray/json/JsonPrinter.scala')
-rw-r--r-- | src/main/scala/spray/json/JsonPrinter.scala | 25 |
1 files changed, 8 insertions, 17 deletions
diff --git a/src/main/scala/spray/json/JsonPrinter.scala b/src/main/scala/spray/json/JsonPrinter.scala index bc1e375..d255e03 100644 --- a/src/main/scala/spray/json/JsonPrinter.scala +++ b/src/main/scala/spray/json/JsonPrinter.scala @@ -97,21 +97,12 @@ trait JsonPrinter extends (JsValue => String) { } object JsonPrinter { - private[this] val mask = new Array[Int](4) - private[this] def ascii(c: Char): Int = c & ((c - 127) >> 31) // branchless for `if (c <= 127) c else 0` - private[this] def mark(c: Char): Unit = { - val b = ascii(c) - mask(b >> 5) |= 1 << (b & 0x1F) - } - private[this] def mark(range: scala.collection.immutable.NumericRange[Char]): Unit = range foreach (mark) - - mark('\u0000' to '\u001f') - mark('\u007f') - mark('"') - mark('\\') - - def requiresEncoding(c: Char): Boolean = { - val b = ascii(c) - (mask(b >> 5) & (1 << (b & 0x1F))) != 0 - } + def requiresEncoding(c: Char): Boolean = + // from RFC 4627 + // unescaped = %x20-21 / %x23-5B / %x5D-10FFFF + c match { + case '"' => true + case '\\' => true + case c => c < 0x20 + } }
\ No newline at end of file |