Add JsonReader.hasRemaining()

plokhotnyuk · Feb 20, 2023 · 6e76cc4 · 6e76cc4
1 parent 82d4600
commit 6e76cc4
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 1 deletion.
diff --git a/...-scala-core/js/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/core/JsonReader.scala b/...-scala-core/js/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/core/JsonReader.scala
@@ -499,6 +499,8 @@ final class JsonReader private[jsoniter_scala](
 
   def isCurrentToken(t: Byte): Boolean = isCurrentToken(t, head)
 
+  def hasRemaining(): Boolean = head < tail || loadMore(head) < tail
+
   def rollbackToken(): Unit = {
     val pos = head
     if (pos == 0) illegalTokenOperation()

diff --git a/...scala-core/jvm/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/core/JsonReader.scala b/...scala-core/jvm/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/core/JsonReader.scala
@@ -525,6 +525,8 @@ final class JsonReader private[jsoniter_scala](
 
   def isCurrentToken(t: Byte): Boolean = isCurrentToken(t, head)
 
+  def hasRemaining(): Boolean = head < tail || loadMore(head) < tail
+
   def rollbackToken(): Unit = {
     val pos = head
     if (pos == 0) illegalTokenOperation()

diff --git a/...la-core/native/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/core/JsonReader.scala b/...la-core/native/src/main/scala/com/github/plokhotnyuk/jsoniter_scala/core/JsonReader.scala
@@ -525,6 +525,8 @@ final class JsonReader private[jsoniter_scala](
 
   def isCurrentToken(t: Byte): Boolean = isCurrentToken(t, head)
 
+  def hasRemaining(): Boolean = head < tail || loadMore(head) < tail
+
   def rollbackToken(): Unit = {
     val pos = head
     if (pos == 0) illegalTokenOperation()

diff --git a/...ore/shared/src/test/scala/com/github/plokhotnyuk/jsoniter_scala/core/JsonReaderSpec.scala b/...ore/shared/src/test/scala/com/github/plokhotnyuk/jsoniter_scala/core/JsonReaderSpec.scala
@@ -463,6 +463,15 @@ class JsonReaderSpec extends AnyWordSpec with Matchers with ScalaCheckPropertyCh
         .getMessage.startsWith("expected preceding call of 'nextToken()' or 'isNextToken()'"))
     }
   }
+  "JsonReader.hasRemaining" should {
+    "return true in case of at least one byte can be read from the input" in {
+      val jsonReader = reader("{\n}")
+      jsonReader.nextToken()
+      jsonReader.hasRemaining() shouldBe true
+      jsonReader.isNextToken('}')
+      jsonReader.hasRemaining() shouldBe false
+    }
+  }
   "JsonReader.readANullOrError" should {
     "parse null value" in {
       val r = reader("null")

diff --git a/version.sbt b/version.sbt
@@ -1 +1 @@
-ThisBuild / version := "2.20.8-SNAPSHOT"
+ThisBuild / version := "2.21.0-SNAPSHOT"