Skip to content
This repository was archived by the owner on Jul 12, 2024. It is now read-only.

Commit 424479d

Browse files
sjrdsjrd
committed
Reorganize packages to match the Scala.js linker conventions.
1 parent 94628e7 commit 424479d

25 files changed

+80
-98
lines changed

Diff for: ‎project/WasmLinkerPlugin.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ object WasmLinkerPlugin extends AutoPlugin {
1919
private val loader = base.loader
2020

2121
private val clearableLinkerMethod = {
22-
Class.forName("wasm.WebAssemblyLinkerImpl", true, loader)
22+
Class.forName("org.scalajs.linker.standard.WebAssemblyLinkerImpl", true, loader)
2323
.getMethod("clearableLinker", classOf[StandardConfig])
2424
}
2525

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

+1-2
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ import scala.scalajs.js.annotation._
77

88
import org.scalajs.macrotaskexecutor.MacrotaskExecutor.Implicits._
99

10-
import wasm.WebAssemblyLinkerImpl
11-
1210
import org.scalajs.linker._
1311
import org.scalajs.linker.interface._
12+
import org.scalajs.linker.standard.WebAssemblyLinkerImpl
1413

1514
import org.scalajs.logging._
1615

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

+7-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package wasm
1+
package org.scalajs.linker.backend
22

33
import scala.concurrent.{ExecutionContext, Future}
44

@@ -10,16 +10,14 @@ import org.scalajs.ir.Names._
1010
import org.scalajs.logging.Logger
1111

1212
import org.scalajs.linker._
13-
import org.scalajs.linker.backend.javascript.SourceMapWriter
1413
import org.scalajs.linker.interface._
1514
import org.scalajs.linker.interface.unstable._
1615
import org.scalajs.linker.standard._
1716

18-
import org.scalajs.linker.backend.webassembly.SourceMapWriterAccess
17+
import org.scalajs.linker.backend.webassembly._
1918

20-
import wasm.ir2wasm._
21-
import wasm.ir2wasm.SpecialNames._
22-
import wasm.wasm4s._
19+
import org.scalajs.linker.backend.wasmemitter._
20+
import org.scalajs.linker.backend.wasmemitter.SpecialNames._
2321

2422
final class WebAssemblyLinkerBackend(
2523
linkerConfig: StandardConfig,
@@ -133,7 +131,7 @@ final class WebAssemblyLinkerBackend(
133131

134132
def maybeWriteWatFile(): Future[Unit] = {
135133
if (linkerConfig.prettyPrint) {
136-
val textOutput = new converters.WasmTextWriter().write(wasmModule)
134+
val textOutput = new WasmTextWriter().write(wasmModule)
137135
val textOutputBytes = textOutput.getBytes(StandardCharsets.UTF_8)
138136
outputImpl.writeFull(watFileName, ByteBuffer.wrap(textOutputBytes))
139137
} else {
@@ -152,7 +150,7 @@ final class WebAssemblyLinkerBackend(
152150

153151
val smWriter =
154152
sourceMapWriter.createSourceMapWriter(wasmFileURI, linkerConfig.relativizeSourceMapBase)
155-
val binaryOutput = new converters.WasmBinaryWriter.WithSourceMap(
153+
val binaryOutput = new WasmBinaryWriter.WithSourceMap(
156154
wasmModule,
157155
emitDebugInfo,
158156
smWriter,
@@ -164,7 +162,7 @@ final class WebAssemblyLinkerBackend(
164162
outputImpl.writeFull(sourceMapFileName, sourceMapWriter.toByteBuffer())
165163
}
166164
} else {
167-
val binaryOutput = new converters.WasmBinaryWriter(wasmModule, emitDebugInfo).write()
165+
val binaryOutput = new WasmBinaryWriter(wasmModule, emitDebugInfo).write()
168166
outputImpl.writeFull(wasmFileName, ByteBuffer.wrap(binaryOutput))
169167
}
170168
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package wasm.ir2wasm
1+
package org.scalajs.linker.backend.wasmemitter
22

33
object EmbeddedConstants {
44
/* Values returned by the `jsValueType` helper.

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

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
1-
package wasm.ir2wasm
1+
package org.scalajs.linker.backend.wasmemitter
22

33
import org.scalajs.ir.{Trees => IRTrees}
44
import org.scalajs.ir.{Types => IRTypes}
55
import org.scalajs.ir.{Names => IRNames}
66
import org.scalajs.ir.{ClassKind, Position}
7+
78
import org.scalajs.linker.standard.LinkedClass
89

9-
import wasm.wasm4s._
10-
import wasm.wasm4s.Names._
11-
import wasm.wasm4s.Names.WasmTypeName._
12-
import wasm.wasm4s.Types._
13-
import wasm.wasm4s.WasmInstr._
10+
import org.scalajs.linker.backend.webassembly._
11+
import org.scalajs.linker.backend.webassembly.Names._
12+
import org.scalajs.linker.backend.webassembly.Names.WasmTypeName._
13+
import org.scalajs.linker.backend.webassembly.Types._
14+
import org.scalajs.linker.backend.webassembly.WasmInstr._
1415

1516
import EmbeddedConstants._
1617
import VarGen._

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package wasm.ir2wasm
1+
package org.scalajs.linker.backend.wasmemitter
22

33
import scala.concurrent.{ExecutionContext, Future}
44

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package wasm.ir2wasm
1+
package org.scalajs.linker.backend.wasmemitter
22

33
import java.nio.charset.StandardCharsets
44

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
package wasm.ir2wasm
2-
3-
import wasm.wasm4s._
1+
package org.scalajs.linker.backend.wasmemitter
42

53
import org.scalajs.ir.{Trees => IRTrees}
64
import org.scalajs.ir.{Types => IRTypes}
@@ -10,6 +8,8 @@ import org.scalajs.ir.Traversers
108

119
import org.scalajs.linker.standard.{LinkedClass, LinkedTopLevelExport}
1210

11+
import org.scalajs.linker.backend.webassembly._
12+
1313
import EmbeddedConstants._
1414
import WasmContext._
1515

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package wasm.ir2wasm
1+
package org.scalajs.linker.backend.wasmemitter
22

33
import org.scalajs.ir.Names._
44
import org.scalajs.ir.Types._

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

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
package wasm
2-
package ir2wasm
1+
package org.scalajs.linker.backend.wasmemitter
32

43
import org.scalajs.ir.ClassKind
54
import org.scalajs.ir.{Types => IRTypes}
65
import org.scalajs.ir.{Trees => IRTrees}
76
import org.scalajs.ir.{Names => IRNames}
87

9-
import wasm.wasm4s._
10-
import wasm.wasm4s.Names._
8+
import org.scalajs.linker.backend.webassembly._
9+
import org.scalajs.linker.backend.webassembly.Names._
1110

1211
import VarGen._
1312

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package wasm.ir2wasm
1+
package org.scalajs.linker.backend.wasmemitter
22

33
import org.scalajs.ir.Names._
44
import org.scalajs.ir.Trees.{JSUnaryOp, JSBinaryOp, MemberNamespace}
55
import org.scalajs.ir.Types._
66

7-
import wasm.wasm4s.Names._
7+
import org.scalajs.linker.backend.webassembly.Names._
88

99
/** Manages name generation for non-local, generated variable names. */
1010
object VarGen {

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

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,6 @@
1-
package wasm
2-
package ir2wasm
1+
package org.scalajs.linker.backend.wasmemitter
32

4-
import wasm4s._
5-
import wasm4s.Names._
6-
import wasm4s.Names.WasmTypeName._
7-
import wasm4s.Types._
8-
import wasm4s.WasmInstr._
3+
import scala.collection.mutable
94

105
import org.scalajs.ir.{Trees => IRTrees}
116
import org.scalajs.ir.{Types => IRTypes}
@@ -15,7 +10,11 @@ import org.scalajs.ir.{ClassKind, Position}
1510
import org.scalajs.linker.interface.unstable.RuntimeClassNameMapperImpl
1611
import org.scalajs.linker.standard.{CoreSpec, LinkedClass, LinkedTopLevelExport}
1712

18-
import collection.mutable
13+
import org.scalajs.linker.backend.webassembly._
14+
import org.scalajs.linker.backend.webassembly.Names._
15+
import org.scalajs.linker.backend.webassembly.Names.WasmTypeName._
16+
import org.scalajs.linker.backend.webassembly.Types._
17+
import org.scalajs.linker.backend.webassembly.WasmInstr._
1918

2019
import EmbeddedConstants._
2120
import VarGen._

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

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,26 @@
1-
package wasm.ir2wasm
1+
package org.scalajs.linker.backend.wasmemitter
22

33
import scala.annotation.tailrec
44

55
import scala.collection.mutable
66
import scala.collection.mutable.LinkedHashMap
77

8-
import wasm.wasm4s._
9-
import wasm.wasm4s.Names._
10-
import wasm.wasm4s.Names.WasmTypeName._
11-
import wasm.wasm4s.Types._
12-
138
import org.scalajs.ir.{Names => IRNames}
149
import org.scalajs.ir.{Types => IRTypes}
1510
import org.scalajs.ir.{Trees => IRTrees}
1611
import org.scalajs.ir.{ClassKind, Position}
1712

18-
import VarGen._
19-
2013
import org.scalajs.linker.interface.ModuleInitializer
2114
import org.scalajs.linker.interface.unstable.ModuleInitializerImpl
2215
import org.scalajs.linker.standard.LinkedTopLevelExport
2316
import org.scalajs.linker.standard.LinkedClass
2417

18+
import org.scalajs.linker.backend.webassembly._
19+
import org.scalajs.linker.backend.webassembly.Names._
20+
import org.scalajs.linker.backend.webassembly.Types._
21+
22+
import VarGen._
23+
2524
abstract class ReadOnlyWasmContext {
2625
import WasmContext._
2726

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

+9-13
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
1-
package wasm
2-
package ir2wasm
1+
package org.scalajs.linker.backend.wasmemitter
32

43
import scala.annotation.switch
54

65
import scala.collection.mutable
76

7+
import org.scalajs.ir.Types.ClassType
8+
import org.scalajs.ir.ClassKind
9+
import org.scalajs.ir.Position
810
import org.scalajs.ir.{Trees => IRTrees}
911
import org.scalajs.ir.{Types => IRTypes}
1012
import org.scalajs.ir.{Names => IRNames}
1113

12-
import wasm4s._
13-
import wasm4s.Names._
14-
import wasm4s.Names.WasmTypeName._
15-
import wasm4s.WasmInstr._
16-
import org.scalajs.ir.Types.ClassType
17-
import org.scalajs.ir.ClassKind
18-
import org.scalajs.ir.Position
14+
import org.scalajs.linker.backend.webassembly._
15+
import org.scalajs.linker.backend.webassembly.Names._
16+
import org.scalajs.linker.backend.webassembly.WasmInstr._
17+
import org.scalajs.linker.backend.webassembly.{WasmFunctionSignature => Sig}
1918

2019
import EmbeddedConstants._
2120
import VarGen._
@@ -582,7 +581,6 @@ private class WasmExpressionBuilder private (
582581
instrs += CALL(genFunctionName.jsValueType)
583582
instrs += LOCAL_TEE(jsValueTypeLocal)
584583

585-
import wasm.wasm4s.{WasmFunctionSignature => Sig}
586584
instrs.switch(Sig(List(Types.WasmInt32), Nil), Sig(Nil, List(Types.WasmInt32))) { () =>
587585
// scrutinee is already on the stack
588586
}(
@@ -1468,8 +1466,7 @@ private class WasmExpressionBuilder private (
14681466
/* Non-Object reference arra types need a sophisticated type test
14691467
* based on assignability of component types.
14701468
*/
1471-
import wasm.wasm4s.{WasmFunctionSignature => Sig}
1472-
import wasm.wasm4s.Types.WasmRefType.anyref
1469+
import Types.WasmRefType.anyref
14731470

14741471
instrs.block(Sig(List(anyref), List(Types.WasmInt32))) { doneLabel =>
14751472
instrs.block(Sig(List(anyref), List(anyref))) { notARefArrayLabel =>
@@ -1597,7 +1594,6 @@ private class WasmExpressionBuilder private (
15971594
targetTpe match {
15981595
case IRTypes.CharType | IRTypes.LongType =>
15991596
// Extract the `value` field (the only field) out of the box class.
1600-
import wasm.wasm4s.{WasmFunctionSignature => Sig}
16011597

16021598
val boxClass =
16031599
if (targetTpe == IRTypes.CharType) SpecialNames.CharBoxClass

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package wasm.ir2wasm
1+
package org.scalajs.linker.backend.wasmemitter
22

33
import scala.collection.mutable
44

@@ -7,10 +7,10 @@ import org.scalajs.ir.{Types => IRTypes}
77
import org.scalajs.ir.{Trees => IRTrees}
88
import org.scalajs.ir.Position
99

10-
import wasm.wasm4s._
11-
import wasm.wasm4s.Names._
12-
import wasm.wasm4s.Types.WasmType
13-
import wasm.wasm4s.WasmInstr._
10+
import org.scalajs.linker.backend.webassembly._
11+
import org.scalajs.linker.backend.webassembly.Names._
12+
import org.scalajs.linker.backend.webassembly.Types.WasmType
13+
import org.scalajs.linker.backend.webassembly.WasmInstr._
1414

1515
class WasmFunctionContext private (
1616
ctx: TypeDefinableWasmContext,

Diff for: ‎wasm/src/main/scala/wasm4s/FunctionBuilder.scala renamed to ‎wasm/src/main/scala/org/scalajs/linker/backend/webassembly/FunctionBuilder.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package wasm.wasm4s
1+
package org.scalajs.linker.backend.webassembly
22

33
import scala.collection.mutable
44

55
import org.scalajs.ir.{Trees => IRTrees}
66
import org.scalajs.ir.Position
77

8-
import wasm.wasm4s.Names._
9-
import wasm.wasm4s.Types.WasmType
10-
import wasm.wasm4s.WasmInstr._
8+
import Names._
9+
import Types.WasmType
10+
import WasmInstr._
1111

1212
final class FunctionBuilder(
1313
moduleBuilder: ModuleBuilder,

Diff for: ‎wasm/src/main/scala/wasm4s/Instructions.scala renamed to ‎wasm/src/main/scala/org/scalajs/linker/backend/webassembly/Instructions.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package wasm.wasm4s
1+
package org.scalajs.linker.backend.webassembly
22
// https://webassembly.github.io/spec/core/syntax/instructions.html
33

44
import org.scalajs.ir.Position

Diff for: ‎wasm/src/main/scala/wasm4s/ModuleBuilder.scala renamed to ‎wasm/src/main/scala/org/scalajs/linker/backend/webassembly/ModuleBuilder.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
package wasm.wasm4s
1+
package org.scalajs.linker.backend.webassembly
22

33
import scala.collection.mutable
44

5-
import wasm.wasm4s.Names._
5+
import Names._
66

77
final class ModuleBuilder(functionSignatureProvider: ModuleBuilder.FunctionSignatureProvider) {
88
import ModuleBuilder._

Diff for: ‎wasm/src/main/scala/wasm4s/Names.scala renamed to ‎wasm/src/main/scala/org/scalajs/linker/backend/webassembly/Names.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package wasm.wasm4s
1+
package org.scalajs.linker.backend.webassembly
22

33
object Names {
44
sealed abstract class WasmName {

Diff for: ‎wasm/src/main/scala/wasm4s/Types.scala renamed to ‎wasm/src/main/scala/org/scalajs/linker/backend/webassembly/Types.scala

+1-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
package wasm.wasm4s
1+
package org.scalajs.linker.backend.webassembly
22

3-
import org.scalajs.ir.{Names => IRNames}
43
import Names._
54
import Names.WasmTypeName._
65

Diff for: ‎wasm/src/main/scala/wasm4s/Wasm.scala renamed to ‎wasm/src/main/scala/org/scalajs/linker/backend/webassembly/Wasm.scala

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,4 @@
1-
package wasm.wasm4s
2-
3-
import scala.collection.mutable
1+
package org.scalajs.linker.backend.webassembly
42

53
import org.scalajs.ir.Position
64

Diff for: ‎wasm/src/main/scala/converters/WasmBinaryWriter.scala renamed to ‎wasm/src/main/scala/org/scalajs/linker/backend/webassembly/WasmBinaryWriter.scala

+4-9
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
1-
package wasm
2-
package converters
1+
package org.scalajs.linker.backend.webassembly
32

43
import scala.annotation.tailrec
54

6-
import java.io.OutputStream
7-
import java.io.ByteArrayOutputStream
8-
95
import org.scalajs.ir.Position
106
import org.scalajs.linker.backend.javascript.SourceMapWriter
117

12-
import wasm.wasm4s._
13-
import wasm.wasm4s.Names._
14-
import wasm.wasm4s.Types._
15-
import wasm.wasm4s.WasmInstr.{BlockType, END}
8+
import Names._
9+
import Types._
10+
import WasmInstr.{BlockType, END}
1611

1712
class WasmBinaryWriter(module: WasmModule, emitDebugInfo: Boolean) {
1813
import WasmBinaryWriter._

0 commit comments

Comments
 (0)