Skip to content

Commit 4b4f897

Browse files
authored
More efficient reading of non-specialized maps with Scala 2
1 parent 3a34de9 commit 4b4f897

File tree

1 file changed

+4
-4
lines changed
  • jsoniter-scala-macros/shared/src/main/scala-2/com/github/plokhotnyuk/jsoniter_scala/macros

1 file changed

+4
-4
lines changed

jsoniter-scala-macros/shared/src/main/scala-2/com/github/plokhotnyuk/jsoniter_scala/macros/JsonCodecMaker.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1631,14 +1631,14 @@ object JsonCodecMaker {
16311631
if (cfg.mapAsArray) {
16321632
val readVal1 = genReadVal(tpe1 :: types, genNullValue(tpe1 :: types), isStringified, EmptyTree)
16331633
val readKV =
1634-
if (isScala213) q"x.addOne(($readVal1, { if (in.isNextToken(',')) $readVal2 else in.commaError() }))"
1635-
else q"x += (($readVal1, { if (in.isNextToken(',')) $readVal2 else in.commaError() }))"
1634+
if (isScala213) q"x.addOne(new _root_.scala.Tuple2($readVal1, { if (in.isNextToken(',')) $readVal2 else in.commaError() }))"
1635+
else q"x += new _root_.scala.Tuple2($readVal1, { if (in.isNextToken(',')) $readVal2 else in.commaError() })"
16361636
genReadMapAsArray(newBuilder, readKV, q"x.result()")
16371637
} else {
16381638
val readKey = genReadKey(tpe1 :: types)
16391639
val readKV =
1640-
if (isScala213) q"x.addOne(($readKey, $readVal2))"
1641-
else q"x += (($readKey, $readVal2))"
1640+
if (isScala213) q"x.addOne(new _root_.scala.Tuple2($readKey, $readVal2))"
1641+
else q"x += new _root_.scala.Tuple2($readKey, $readVal2)"
16421642
genReadMap(newBuilder, readKV, q"x.result()")
16431643
}
16441644
} else if (tpe <:< typeOf[BitSet]) withDecoderFor(methodKey, default) {

0 commit comments

Comments
 (0)