Merge pull request #122 from sjrd/adapt-to-scala-js-core-structure

Getting closer to the Scala.js linker architecture.

Author: tanishiking

Diff for: project/WasmLinkerPlugin.scala

@@ -19,7 +19,7 @@ object WasmLinkerPlugin extends AutoPlugin {
     private val loader = base.loader
 
     private val clearableLinkerMethod = {
-      Class.forName("wasm.WebAssemblyLinkerImpl", true, loader)
+      Class.forName("org.scalajs.linker.standard.WebAssemblyLinkerImpl", true, loader)
         .getMethod("clearableLinker", classOf[StandardConfig])
     }
 

Diff for: tests/src/test/scala/tests/CoreTests.scala

@@ -7,10 +7,9 @@ import scala.scalajs.js.annotation._
 
 import org.scalajs.macrotaskexecutor.MacrotaskExecutor.Implicits._
 
-import wasm.WebAssemblyLinkerImpl
-
 import org.scalajs.linker._
 import org.scalajs.linker.interface._
+import org.scalajs.linker.standard.WebAssemblyLinkerImpl
 
 import org.scalajs.logging._
 

Diff for: wasm/src/main/scala/WebAssemblyLinkerBackend.scala renamed to wasm/src/main/scala/org/scalajs/linker/backend/WebAssemblyLinkerBackend.scala

@@ -1,4 +1,4 @@
-package wasm
+package org.scalajs.linker.backend
 
 import scala.concurrent.{ExecutionContext, Future}
 
@@ -10,16 +10,14 @@ import org.scalajs.ir.Names._
 import org.scalajs.logging.Logger
 
 import org.scalajs.linker._
-import org.scalajs.linker.backend.javascript.SourceMapWriter
 import org.scalajs.linker.interface._
 import org.scalajs.linker.interface.unstable._
 import org.scalajs.linker.standard._
 
-import org.scalajs.linker.backend.webassembly.SourceMapWriterAccess
+import org.scalajs.linker.backend.webassembly._
 
-import wasm.ir2wasm._
-import wasm.ir2wasm.SpecialNames._
-import wasm.wasm4s._
+import org.scalajs.linker.backend.wasmemitter._
+import org.scalajs.linker.backend.wasmemitter.SpecialNames._
 
 final class WebAssemblyLinkerBackend(
     linkerConfig: StandardConfig,
@@ -63,9 +61,8 @@ final class WebAssemblyLinkerBackend(
       ec: ExecutionContext
   ): Future[Report] = {
 
-    val wasmModule = new WasmModule
     val builder = new WasmBuilder(coreSpec)
-    implicit val context: WasmContext = new WasmContext(wasmModule)
+    implicit val context: WasmContext = new WasmContext()
 
     val onlyModule = moduleSet.modules match {
       case onlyModule :: Nil =>
@@ -110,6 +107,8 @@ final class WebAssemblyLinkerBackend(
       onlyModule.topLevelExports
     )
 
+    val wasmModule = context.moduleBuilder.build()
+
     val outputImpl = OutputDirectoryImpl.fromOutputDirectory(output)
 
     val watFileName = s"$moduleID.wat"
@@ -132,7 +131,7 @@ final class WebAssemblyLinkerBackend(
 
     def maybeWriteWatFile(): Future[Unit] = {
       if (linkerConfig.prettyPrint) {
-        val textOutput = new converters.WasmTextWriter().write(wasmModule)
+        val textOutput = new WasmTextWriter().write(wasmModule)
         val textOutputBytes = textOutput.getBytes(StandardCharsets.UTF_8)
         outputImpl.writeFull(watFileName, ByteBuffer.wrap(textOutputBytes))
       } else {
@@ -151,7 +150,7 @@ final class WebAssemblyLinkerBackend(
 
         val smWriter =
           sourceMapWriter.createSourceMapWriter(wasmFileURI, linkerConfig.relativizeSourceMapBase)
-        val binaryOutput = new converters.WasmBinaryWriter.WithSourceMap(
+        val binaryOutput = new WasmBinaryWriter.WithSourceMap(
           wasmModule,
           emitDebugInfo,
           smWriter,
@@ -163,7 +162,7 @@ final class WebAssemblyLinkerBackend(
           outputImpl.writeFull(sourceMapFileName, sourceMapWriter.toByteBuffer())
         }
       } else {
-        val binaryOutput = new converters.WasmBinaryWriter(wasmModule, emitDebugInfo).write()
+        val binaryOutput = new WasmBinaryWriter(wasmModule, emitDebugInfo).write()
         outputImpl.writeFull(wasmFileName, ByteBuffer.wrap(binaryOutput))
       }
     }

Diff for: wasm/src/main/scala/ir2wasm/EmbeddedConstants.scala renamed to wasm/src/main/scala/org/scalajs/linker/backend/wasmemitter/EmbeddedConstants.scala

@@ -1,4 +1,4 @@
-package wasm.ir2wasm
+package org.scalajs.linker.backend.wasmemitter
 
 object EmbeddedConstants {
   /* Values returned by the `jsValueType` helper.