#53 - build test

chris-twiner · Jan 22, 2024 · acd4382 · acd4382
1 parent 56b63e8
commit acd4382
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 50 deletions.
diff --git a/aalto/src/main/scala/scales/xml/parser/pull/aalto/AsyncParser.scala b/aalto/src/main/scala/scales/xml/parser/pull/aalto/AsyncParser.scala
@@ -277,26 +277,21 @@ object AsyncParser {
 
     def step(fromStart: Boolean): Input[DataChunk] => ResumableIter[DataChunk, F, EphemeralStream[PullType]] = s =>
       s(el = e => {
-          if (e eq SuspendData)
-            done((emptyEphemeralStream, cont(step(false))), Input.Empty[DataChunk])
-          else {
-
-            val r = parser.nextInput(e)
-
-            r(el = es => {
-                done((es,
-                  cont(step(false)))
-                  , Input.Empty[DataChunk])
-              },
-              empty = {
-                //emptyness
-                cont(step(false))
-              },
-              eof = {
-                EOF
-              }
-            )
-          }
+          val r = parser.nextInput(e)
+
+          r(el = es => {
+              done((es,
+                cont(step(false)))
+                , Input.Empty[DataChunk])
+            },
+            empty = {
+              //emptyness
+              cont(step(false))
+            },
+            eof = {
+              EOF
+            }
+          )
         },
         empty = {
           cont(step(false))

diff --git a/docs/Getting_Started/release_notes/0.6.0.md b/docs/Getting_Started/release_notes/0.6.0.md
@@ -362,6 +362,8 @@ val p = doSomethingReturningAnFofA
 val a: A = p runIt
 ```
 
+If you are having issues on 2.11/2.12 if the type is Trampoline make sure the import of monadHelpers is "_" or explicitly imports TrampolinePerformer as well (2.13 finds it without issue under Performer). 
+
 In order to make re-usable code specify the correct implicits, including the correct monad iteratees:
 
 ```scala

diff --git a/scales-xml/src/main/scala/scales/utils/io/DataChunk.scala b/scales-xml/src/main/scala/scales/utils/io/DataChunk.scala
@@ -35,17 +35,6 @@ object EmptyData extends DataChunk {
   override val isEmpty = true
 }
 
-/**
- * Represents a data stream that has had too many empty reads (pretty much only aalto parsing)
- */
-object SuspendData extends DataChunk {
-  val array = Array.empty[Byte]
-  val offset = -23
-  val length = 0
-
-  override val isEmpty = true
-}
-
 /**
  * Represents the full array
  */ 
@@ -55,16 +44,6 @@ final case class FullChunk( array: Array[Byte] ) extends DataChunk {
 }
 
 /**
- * A section of a Byte array.  Due to Trampolining this cannot be re-used, as such a copy is made.  TODO Perhaps this should be optional
+ * A section of a Byte array.
  */ 
-//final case class Chunk( array: Array[Byte], offset: Int, length: Int) extends DataChunk
-
-object Chunk{
-  def apply( array: Array[Byte], offset: Int, length: Int): DataChunk =
-    FullChunk{
-      val c = Array.ofDim[Byte](length)
-      Array.copy(array, offset, c, 0, length)
-      c
-    }
-}
-
+final case class Chunk( array: Array[Byte], offset: Int, length: Int) extends DataChunk
diff --git a/scales-xml/src/main/scala/scales/utils/io/ReadableByteChannelWrapper.scala b/scales-xml/src/main/scala/scales/utils/io/ReadableByteChannelWrapper.scala
@@ -243,12 +243,9 @@ trait ReadableByteChannelWrapperImplicits {
               val nextIStep =
                 if (realChunk.isEOF)
                   k(Eof[DataChunk])
-                else if (realChunk.isEmpty) {
-                  if (shouldPause)
-                    k(Element(SuspendData))
-                  else
-                    k(Empty[DataChunk])
-                } else
+                else if (realChunk.isEmpty)
+                  k(Empty[DataChunk])
+                else
                   k(Element(realChunk))
 
               F.bind(nextIStep.value) { step =>

diff --git a/scales-xml/src/test/scala/scales/utils/IterateeTests.scala b/scales-xml/src/test/scala/scales/utils/IterateeTests.scala
@@ -18,7 +18,7 @@ import scales.utils._
 
 import scala.annotation.tailrec
 import scales.utils.iteratee.functions.IterOps
-import scales.utils.iteratee.monadHelpers.Performer
+import scales.utils.iteratee.monadHelpers._
 object StreamHelpers {
 
   def lTo(lower: Long, upper: Long): EphemeralStream[Long] =