minimize-modules: move code around

common/jvm/src/main/scala/scalan/reflection/JavaImpl.scala

@@ -134,9 +134,6 @@ object JRConstructor {
   */
 class JRMethod private (val value: Method) extends RMethod {
   override def invoke(obj: Any, args: AnyRef*): AnyRef = {
-//    val name = value.getName
-//    val parameterTypes: Seq[Class[_]] = value.getParameterTypes
-//    memoize(declaringClass.methods)((name, parameterTypes), this)
     value.invoke(obj, args:_*)
   }
 

common/shared/src/main/scala/special/collection/CollType.scala

@@ -0,0 +1,11 @@
+package special.collection
+
+import scalan.RType
+import scala.reflect.ClassTag
+
+/** Type descriptor for `Coll[A]` type. */
+case class CollType[A](tItem: RType[A]) extends RType[Coll[A]] {
+  override val classTag: ClassTag[Coll[A]] = ClassTag[Coll[A]](classOf[Coll[A]])
+
+  override def name: String = s"Coll[${tItem.name}]"
+}

common/shared/src/main/scala/special/collection/CollsOverArrays.scala

@@ -1,10 +1,9 @@
 package special.collection
 
 import java.util
-import scalan._
+import scalan._  // required
 import scalan.util.CollectionUtil
 import scalan.RType
-import Helpers._
 import debox.Buffer
 import scalan.RType._
 import sigmastate.VersionContext

common/shared/src/main/scala/special/collection/package.scala

@@ -1,17 +1,9 @@
 package special
 
-import scala.language.implicitConversions
 import scalan.RType
 
-import scala.reflect.{classTag, ClassTag}
-
-package collection {
-  /** Type descriptor for `Coll[A]` type. */
-  case class CollType[A](tItem: RType[A]) extends RType[Coll[A]] {
-    override val classTag: ClassTag[Coll[A]] = ClassTag[Coll[A]](classOf[Coll[A]])
-    override def name: String = s"Coll[${tItem.name}]"
-  }
-}
+import scala.language.implicitConversions
+import scala.reflect.classTag
 
 package object collection {
   /** Forces reflection data initialization */
@@ -30,4 +22,11 @@ package object collection {
   implicit def downcastCollType[A](ct: RType[Coll[A]]): CollType[A] = ct.asInstanceOf[CollType[A]]
 
   implicit val collBuilderRType: RType[CollBuilder] = RType.fromClassTag(classTag[CollBuilder])
+
+  private def sameLengthErrorMsg[A, B](xs: Coll[A], ys: Coll[B]) =
+    s"Collections should have same length but was ${xs.length} and ${ys.length}:\n xs=$xs;\n ys=$ys"
+
+  def requireSameLength[A, B](xs: Coll[A], ys: Coll[B]) = {
+    require(xs.length == ys.length, sameLengthErrorMsg(xs, ys))
+  }
 }

common/shared/src/main/scala/special/sigma/SigmaDsl.scala

@@ -316,7 +316,7 @@ trait Box {
     * @tparam T expected type of the register.
     * @return Some(value) if the register is defined AND has the given type.
     *         None otherwise
-    * @throws special.sigma.InvalidType exception when the type of the register value is
+    * @throws `sigmastate.eval.InvalidType` exception when the type of the register value is
     *                                   different from cT.
     * @since 2.0
     */

sc/shared/src/main/scala/scalan/GraphIRReflection.scala

@@ -2,7 +2,8 @@ package scalan
 
 import scalan.primitives.Thunks
 import scalan.reflection.CommonReflection.registerClassEntry
-import scalan.reflection.{mkConstructor, mkMethod, CommonReflection}
+import scalan.reflection.{CommonReflection, mkConstructor, mkMethod}
+import sigmastate.eval.SigmaLibrary
 import special.CoreLibReflection
 import special.collection.Colls
 import special.sigma.SigmaDsl

sc/shared/src/main/scala/sigmastate/eval/GraphBuilding.scala

@@ -4,7 +4,7 @@ import org.ergoplatform._
 import scalan.ExactIntegral.{ByteIsExactIntegral, IntIsExactIntegral, LongIsExactIntegral, ShortIsExactIntegral}
 import scalan.ExactOrdering.{ByteIsExactOrdering, IntIsExactOrdering, LongIsExactOrdering, ShortIsExactOrdering}
 import scalan.util.Extensions.ByteOps
-import scalan.{ExactIntegral, ExactNumeric, ExactOrdering, Lazy, MutableLazy, Nullable, SigmaLibrary}
+import scalan.{ExactIntegral, ExactNumeric, ExactOrdering, Lazy, MutableLazy, Nullable}
 import sigmastate.Values.Value.Typed
 import sigmastate.Values._
 import sigmastate.interpreter.Interpreter.ScriptEnv

sc/shared/src/main/scala/scalan/SigmaLibrary.scala → sc/shared/src/main/scala/sigmastate/eval/SigmaLibrary.scala

@@ -1,5 +1,6 @@
-package scalan
+package sigmastate.eval
 
+import scalan.Library
 import special.sigma.SigmaDslModule
 
 /** Main trait which represents sigma operations in graph IR cake. */

sc/shared/src/main/scala/sigmastate/eval/TreeBuilding.scala

@@ -10,7 +10,6 @@ import sigmastate.serialization.ConstantStore
 
 import scala.collection.mutable.ArrayBuffer
 import SType._
-import scalan.SigmaLibrary
 import sigmastate.basics.DLogProtocol.ProveDlog
 import sigmastate.basics.ProveDHTuple
 import sigmastate.lang.Terms

sc/shared/src/main/scala/special/sigma/SigmaDslUnit.scala

@@ -1,5 +1,6 @@
 package special.sigma {
   import scalan._
+  import sigmastate.eval.SigmaLibrary
 
   trait SigmaDsl extends Base { self: SigmaLibrary =>
     trait BigInt extends Def[BigInt] {

sc/shared/src/main/scala/special/sigma/impl/SigmaDslImpl.scala

@@ -1,13 +1,14 @@
 package special.sigma
 
-import scala.language.{existentials,implicitConversions}
+import scala.language.{existentials, implicitConversions}
 import scalan._
+import sigmastate.eval.SigmaLibrary
+
 import scala.collection.compat.immutable.ArraySeq
 
 package impl {
-  import scalan.OverloadHack.Overloaded1
-  import scalan.reflection.CommonReflection.registerClassEntry
-  import scalan.reflection.{RClass, RMethod, SRMethod} // manual fix
+  import scalan.reflection.{RClass, RMethod}
+  import sigmastate.eval.SigmaLibrary
 
   // Abs -----------------------------------
 trait SigmaDslDefs extends scalan.Scalan with SigmaDsl {