Enable scala2 inliner

.scalafmt.conf

@@ -9,3 +9,4 @@ danglingParentheses.preset = true
 rewrite.rules = [AvoidInfix, SortImports, RedundantBraces, RedundantParens, SortModifiers]
 docstrings.style = Asterisk
 align.preset = none
+project.layout = StandardConvention

build.sbt

@@ -16,7 +16,19 @@ ThisBuild / tlFatalWarningsInCi := false
 
 lazy val jawnSettings = Seq(
   Test / testOptions += Tests.Argument(TestFrameworks.ScalaCheck, "-verbosity", "1"),
-  libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.17.0" % Test
+  libraryDependencies += "org.scalacheck" %%% "scalacheck" % "1.17.0" % Test,
+  scalacOptions ++= {
+    CrossVersion.partialVersion(scalaVersion.value) match {
+      case Some((2, n)) if n == 12 | n == 13 =>
+        Seq(
+          "-opt-inline-from:<sources>",
+          "-opt:l:inline"
+        )
+      case Some((3, _)) =>
+        // Optimizer not yet available for Scala3, see https://docs.scala-lang.org/overviews/compiler-options/optimizer.html
+        Seq.empty
+    }
+  }
 )
 
 lazy val jawnSettingsJVM = List(Test / fork := true)

parser/js/src/main/mima-filters/1.5.1.backwards.excludes/inline-parser-states.excludes

@@ -0,0 +1,7 @@
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.typelevel.jawn.Parser.ARRBEG")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.typelevel.jawn.Parser.ARREND")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.typelevel.jawn.Parser.DATA")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.typelevel.jawn.Parser.KEY")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.typelevel.jawn.Parser.OBJBEG")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.typelevel.jawn.Parser.OBJEND")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.typelevel.jawn.Parser.SEP")

parser/jvm/src/main/mima-filters/1.5.1.backwards.excludes/inline-parser-states.excludes

@@ -0,0 +1,7 @@
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.typelevel.jawn.Parser.ARRBEG")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.typelevel.jawn.Parser.ARREND")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.typelevel.jawn.Parser.DATA")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.typelevel.jawn.Parser.KEY")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.typelevel.jawn.Parser.OBJBEG")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.typelevel.jawn.Parser.OBJEND")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.typelevel.jawn.Parser.SEP")

parser/native/src/main/mima-filters/1.5.1.backwards.excludes/inline-parser-states.excludes

@@ -0,0 +1,7 @@
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.typelevel.jawn.Parser.ARRBEG")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.typelevel.jawn.Parser.ARREND")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.typelevel.jawn.Parser.DATA")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.typelevel.jawn.Parser.KEY")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.typelevel.jawn.Parser.OBJBEG")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.typelevel.jawn.Parser.OBJEND")
+ProblemFilters.exclude[DirectMissingMethodProblem]("org.typelevel.jawn.Parser.SEP")

parser/shared/src/main/scala-2/jawn/AsyncParserStates.scala

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2012 Typelevel
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package org.typelevel.jawn
+
+private[jawn] trait AsyncParserStates {
+
+  /**
+   * Explanation of the new synthetic states. The parser machinery uses positive integers for states while parsing json
+   * values. We use these negative states to keep track of the async parser's status between json values.
+   *
+   * ASYNC_PRESTART: We haven't seen any non-whitespace yet. We could be parsing an array, or not. We are waiting for
+   * valid JSON.
+   *
+   * ASYNC_START: We've seen an array and have begun unwrapping it. We could see a ] if the array is empty, or valid
+   * JSON.
+   *
+   * ASYNC_END: We've parsed an array and seen the final ]. At this point we should only see whitespace or an EOF.
+   *
+   * ASYNC_POSTVAL: We just parsed a value from inside the array. We expect to see whitespace, a comma, or a ].
+   *
+   * ASYNC_PREVAL: We are in an array and we just saw a comma. We expect to see whitespace or a JSON value.
+   */
+  @inline final def ASYNC_PRESTART = -5
+  @inline final def ASYNC_START = -4
+  @inline final def ASYNC_END = -3
+  @inline final def ASYNC_POSTVAL = -2
+  @inline final def ASYNC_PREVAL = -1
+}

parser/shared/src/main/scala-2/jawn/ParserStates.scala

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2012 Typelevel
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package org.typelevel.jawn
+
+private[jawn] trait ParserStates {
+  @inline final val ARRBEG = 6
+  @inline final val OBJBEG = 7
+  @inline final val DATA = 1
+  @inline final val KEY = 2
+  @inline final val SEP = 3
+  @inline final val ARREND = 4
+  @inline final val OBJEND = 5
+}

parser/shared/src/main/scala-3/jawn/AsyncParserStates.scala

@@ -0,0 +1,47 @@
+/*
+ * Copyright (c) 2012 Typelevel
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package org.typelevel.jawn
+
+private[jawn] trait AsyncParserStates {
+
+  /**
+   * Explanation of the new synthetic states. The parser machinery uses positive integers for states while parsing json
+   * values. We use these negative states to keep track of the async parser's status between json values.
+   *
+   * ASYNC_PRESTART: We haven't seen any non-whitespace yet. We could be parsing an array, or not. We are waiting for
+   * valid JSON.
+   *
+   * ASYNC_START: We've seen an array and have begun unwrapping it. We could see a ] if the array is empty, or valid
+   * JSON.
+   *
+   * ASYNC_END: We've parsed an array and seen the final ]. At this point we should only see whitespace or an EOF.
+   *
+   * ASYNC_POSTVAL: We just parsed a value from inside the array. We expect to see whitespace, a comma, or a ].
+   *
+   * ASYNC_PREVAL: We are in an array and we just saw a comma. We expect to see whitespace or a JSON value.
+   */
+  final inline def ASYNC_PRESTART = -5
+  final inline def ASYNC_START = -4
+  final inline def ASYNC_END = -3
+  final inline def ASYNC_POSTVAL = -2
+  final inline def ASYNC_PREVAL = -1
+}

parser/shared/src/main/scala-3/jawn/ParserStates.scala

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2012 Typelevel
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+package org.typelevel.jawn
+
+private[jawn] trait ParserStates {
+  final inline val ARRBEG = 6
+  final inline val OBJBEG = 7
+  final inline val DATA = 1
+  final inline val KEY = 2
+  final inline val SEP = 3
+  final inline val ARREND = 4
+  final inline val OBJEND = 5
+}

parser/shared/src/main/scala/jawn/AsyncParser.scala

@@ -106,7 +106,8 @@ final class AsyncParser[J] protected[jawn] (
   protected[jawn] var done: Boolean,
   protected[jawn] var streamMode: Int,
   protected[jawn] val multiValue: Boolean
-) extends ByteBasedParser[J] {
+) extends ByteBasedParser[J]
+    with AsyncParserStates {
 
   protected[jawn] def this(state: Int,
                            curr: Int,
@@ -180,28 +181,6 @@ final class AsyncParser[J] protected[jawn] (
       allocated = newsize
     }
 
-  /**
-   * Explanation of the new synthetic states. The parser machinery uses positive integers for states while parsing json
-   * values. We use these negative states to keep track of the async parser's status between json values.
-   *
-   * ASYNC_PRESTART: We haven't seen any non-whitespace yet. We could be parsing an array, or not. We are waiting for
-   * valid JSON.
-   *
-   * ASYNC_START: We've seen an array and have begun unwrapping it. We could see a ] if the array is empty, or valid
-   * JSON.
-   *
-   * ASYNC_END: We've parsed an array and seen the final ]. At this point we should only see whitespace or an EOF.
-   *
-   * ASYNC_POSTVAL: We just parsed a value from inside the array. We expect to see whitespace, a comma, or a ].
-   *
-   * ASYNC_PREVAL: We are in an array and we just saw a comma. We expect to see whitespace or a JSON value.
-   */
-  @inline final private[this] def ASYNC_PRESTART = -5
-  @inline final private[this] def ASYNC_START = -4
-  @inline final private[this] def ASYNC_END = -3
-  @inline final private[this] def ASYNC_POSTVAL = -2
-  @inline final private[this] def ASYNC_PREVAL = -1
-
   protected[jawn] def churn()(implicit facade: Facade[J]): Either[ParseException, collection.Seq[J]] = {
 
     // accumulates json values

parser/shared/src/main/scala/jawn/Parser.scala

@@ -488,7 +488,7 @@ abstract class Parser[J] {
   }
 }
 
-object Parser extends ParserCompanionPlatform {
+object Parser extends ParserCompanionPlatform with ParserStates {
 
   def parseUnsafe[J](s: String)(implicit facade: Facade[J]): J =
     new StringParser(s).parse()
@@ -507,20 +507,6 @@ object Parser extends ParserCompanionPlatform {
 
   def async[J](mode: AsyncParser.Mode): AsyncParser[J] = AsyncParser[J](mode)
 
-  /**
-   * Private variables.
-   */
-  /**
-   * Valid parser states.
-   */
-  @inline final private[jawn] val ARRBEG = 6
-  @inline final private[jawn] val OBJBEG = 7
-  @inline final private[jawn] val DATA = 1
-  @inline final private[jawn] val KEY = 2
-  @inline final private[jawn] val SEP = 3
-  @inline final private[jawn] val ARREND = 4
-  @inline final private[jawn] val OBJEND = 5
-
   final private[jawn] val HexChars: Array[Int] = {
     val arr = Array.fill(128)(-1)
     var i = 0