diff --git a/src/de/inetsoftware/jwebassembly/binary/BinaryModuleWriter.java b/src/de/inetsoftware/jwebassembly/binary/BinaryModuleWriter.java index cc6b033..6ea8543 100644 --- a/src/de/inetsoftware/jwebassembly/binary/BinaryModuleWriter.java +++ b/src/de/inetsoftware/jwebassembly/binary/BinaryModuleWriter.java @@ -31,13 +31,13 @@ import javax.annotation.Nullable; import de.inetsoftware.classparser.Member; import de.inetsoftware.jwebassembly.JWebAssembly; -import de.inetsoftware.jwebassembly.module.ArrayOperator; import de.inetsoftware.jwebassembly.module.FunctionName; import de.inetsoftware.jwebassembly.module.ModuleWriter; -import de.inetsoftware.jwebassembly.module.NumericOperator; -import de.inetsoftware.jwebassembly.module.ValueType; import de.inetsoftware.jwebassembly.module.ValueTypeConvertion; -import de.inetsoftware.jwebassembly.module.WasmBlockOperator; +import de.inetsoftware.jwebassembly.wasm.ArrayOperator; +import de.inetsoftware.jwebassembly.wasm.NumericOperator; +import de.inetsoftware.jwebassembly.wasm.ValueType; +import de.inetsoftware.jwebassembly.wasm.WasmBlockOperator; /** * Module Writer for binary format. http://webassembly.org/docs/binary-encoding/ diff --git a/src/de/inetsoftware/jwebassembly/binary/FunctionType.java b/src/de/inetsoftware/jwebassembly/binary/FunctionType.java index 480da58..8cc298c 100644 --- a/src/de/inetsoftware/jwebassembly/binary/FunctionType.java +++ b/src/de/inetsoftware/jwebassembly/binary/FunctionType.java @@ -20,7 +20,7 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; -import de.inetsoftware.jwebassembly.module.ValueType; +import de.inetsoftware.jwebassembly.wasm.ValueType; /** * An entry in the type section of the WebAssembly. diff --git a/src/de/inetsoftware/jwebassembly/binary/Global.java b/src/de/inetsoftware/jwebassembly/binary/Global.java index 3933dc9..40db471 100644 --- a/src/de/inetsoftware/jwebassembly/binary/Global.java +++ b/src/de/inetsoftware/jwebassembly/binary/Global.java @@ -17,7 +17,7 @@ package de.inetsoftware.jwebassembly.binary; import java.io.IOException; -import de.inetsoftware.jwebassembly.module.ValueType; +import de.inetsoftware.jwebassembly.wasm.ValueType; /** * An entry in the global section of the WebAssembly. diff --git a/src/de/inetsoftware/jwebassembly/binary/WasmOutputStream.java b/src/de/inetsoftware/jwebassembly/binary/WasmOutputStream.java index d666c57..b9b73ef 100644 --- a/src/de/inetsoftware/jwebassembly/binary/WasmOutputStream.java +++ b/src/de/inetsoftware/jwebassembly/binary/WasmOutputStream.java @@ -1,5 +1,5 @@ /* - * Copyright 2017 Volker Berlin (i-net software) + * Copyright 2017 - 2018 Volker Berlin (i-net software) * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -24,7 +24,7 @@ import java.nio.charset.StandardCharsets; import javax.annotation.Nonnegative; import javax.annotation.Nonnull; -import de.inetsoftware.jwebassembly.module.ValueType; +import de.inetsoftware.jwebassembly.wasm.ValueType; /** * @author Volker Berlin diff --git a/src/de/inetsoftware/jwebassembly/module/BranchManger.java b/src/de/inetsoftware/jwebassembly/module/BranchManger.java index 963031a..e944cf5 100644 --- a/src/de/inetsoftware/jwebassembly/module/BranchManger.java +++ b/src/de/inetsoftware/jwebassembly/module/BranchManger.java @@ -28,6 +28,9 @@ import javax.annotation.Nonnull; import de.inetsoftware.classparser.CodeInputStream; import de.inetsoftware.classparser.TryCatchFinally; import de.inetsoftware.jwebassembly.WasmException; +import de.inetsoftware.jwebassembly.wasm.NumericOperator; +import de.inetsoftware.jwebassembly.wasm.ValueType; +import de.inetsoftware.jwebassembly.wasm.WasmBlockOperator; /** * This calculate the goto offsets from Java back to block operations diff --git a/src/de/inetsoftware/jwebassembly/module/JavaMethodWasmCodeBuilder.java b/src/de/inetsoftware/jwebassembly/module/JavaMethodWasmCodeBuilder.java index 1fcd9d8..9c0a65c 100644 --- a/src/de/inetsoftware/jwebassembly/module/JavaMethodWasmCodeBuilder.java +++ b/src/de/inetsoftware/jwebassembly/module/JavaMethodWasmCodeBuilder.java @@ -25,6 +25,10 @@ import de.inetsoftware.classparser.CodeInputStream; import de.inetsoftware.classparser.ConstantPool; import de.inetsoftware.classparser.ConstantRef; import de.inetsoftware.jwebassembly.WasmException; +import de.inetsoftware.jwebassembly.wasm.ArrayOperator; +import de.inetsoftware.jwebassembly.wasm.NumericOperator; +import de.inetsoftware.jwebassembly.wasm.ValueType; +import de.inetsoftware.jwebassembly.wasm.WasmBlockOperator; /** * Convert Java Byte Code to a list of WasmInstruction. diff --git a/src/de/inetsoftware/jwebassembly/module/LocaleVariableManager.java b/src/de/inetsoftware/jwebassembly/module/LocaleVariableManager.java index 50db5da..42de449 100644 --- a/src/de/inetsoftware/jwebassembly/module/LocaleVariableManager.java +++ b/src/de/inetsoftware/jwebassembly/module/LocaleVariableManager.java @@ -21,6 +21,7 @@ import java.util.Arrays; import java.util.List; import de.inetsoftware.jwebassembly.WasmException; +import de.inetsoftware.jwebassembly.wasm.ValueType; /** * This manager monitor the locale variables of a method to create a translation from the slot based index in Java to diff --git a/src/de/inetsoftware/jwebassembly/module/ModuleGenerator.java b/src/de/inetsoftware/jwebassembly/module/ModuleGenerator.java index 05a158e..b7ce0d0 100644 --- a/src/de/inetsoftware/jwebassembly/module/ModuleGenerator.java +++ b/src/de/inetsoftware/jwebassembly/module/ModuleGenerator.java @@ -33,6 +33,8 @@ import de.inetsoftware.classparser.LocalVariableTable; import de.inetsoftware.classparser.MethodInfo; import de.inetsoftware.jwebassembly.JWebAssembly; import de.inetsoftware.jwebassembly.WasmException; +import de.inetsoftware.jwebassembly.wasm.ValueType; +import de.inetsoftware.jwebassembly.wasm.ValueTypeParser; import de.inetsoftware.jwebassembly.watparser.WatParser; /** diff --git a/src/de/inetsoftware/jwebassembly/module/ModuleWriter.java b/src/de/inetsoftware/jwebassembly/module/ModuleWriter.java index 7ed9b0c..8d41966 100644 --- a/src/de/inetsoftware/jwebassembly/module/ModuleWriter.java +++ b/src/de/inetsoftware/jwebassembly/module/ModuleWriter.java @@ -22,6 +22,10 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import de.inetsoftware.classparser.Member; +import de.inetsoftware.jwebassembly.wasm.ArrayOperator; +import de.inetsoftware.jwebassembly.wasm.NumericOperator; +import de.inetsoftware.jwebassembly.wasm.ValueType; +import de.inetsoftware.jwebassembly.wasm.WasmBlockOperator; /** * Module Writer base class. diff --git a/src/de/inetsoftware/jwebassembly/module/WasmArrayInstruction.java b/src/de/inetsoftware/jwebassembly/module/WasmArrayInstruction.java index eafcdf1..44f10b8 100644 --- a/src/de/inetsoftware/jwebassembly/module/WasmArrayInstruction.java +++ b/src/de/inetsoftware/jwebassembly/module/WasmArrayInstruction.java @@ -22,6 +22,8 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import de.inetsoftware.jwebassembly.WasmException; +import de.inetsoftware.jwebassembly.wasm.ArrayOperator; +import de.inetsoftware.jwebassembly.wasm.ValueType; /** * WasmInstruction for numeric operation. diff --git a/src/de/inetsoftware/jwebassembly/module/WasmBlockInstruction.java b/src/de/inetsoftware/jwebassembly/module/WasmBlockInstruction.java index 5e829fc..4037e5f 100644 --- a/src/de/inetsoftware/jwebassembly/module/WasmBlockInstruction.java +++ b/src/de/inetsoftware/jwebassembly/module/WasmBlockInstruction.java @@ -21,6 +21,9 @@ import java.io.IOException; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import de.inetsoftware.jwebassembly.wasm.ValueType; +import de.inetsoftware.jwebassembly.wasm.WasmBlockOperator; + /** * WasmInstruction for block operation. * diff --git a/src/de/inetsoftware/jwebassembly/module/WasmCallInstruction.java b/src/de/inetsoftware/jwebassembly/module/WasmCallInstruction.java index 9a9289d..a5273e0 100644 --- a/src/de/inetsoftware/jwebassembly/module/WasmCallInstruction.java +++ b/src/de/inetsoftware/jwebassembly/module/WasmCallInstruction.java @@ -21,6 +21,8 @@ import java.io.IOException; import javax.annotation.Nonnull; import de.inetsoftware.classparser.Member; +import de.inetsoftware.jwebassembly.wasm.ValueType; +import de.inetsoftware.jwebassembly.wasm.ValueTypeParser; /** * WasmInstruction for a function call. diff --git a/src/de/inetsoftware/jwebassembly/module/WasmCodeBuilder.java b/src/de/inetsoftware/jwebassembly/module/WasmCodeBuilder.java index 08630ba..338c0da 100644 --- a/src/de/inetsoftware/jwebassembly/module/WasmCodeBuilder.java +++ b/src/de/inetsoftware/jwebassembly/module/WasmCodeBuilder.java @@ -23,6 +23,10 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import de.inetsoftware.classparser.Member; +import de.inetsoftware.jwebassembly.wasm.ArrayOperator; +import de.inetsoftware.jwebassembly.wasm.NumericOperator; +import de.inetsoftware.jwebassembly.wasm.ValueType; +import de.inetsoftware.jwebassembly.wasm.WasmBlockOperator; /** * Base class for Code Building. diff --git a/src/de/inetsoftware/jwebassembly/module/WasmConstInstruction.java b/src/de/inetsoftware/jwebassembly/module/WasmConstInstruction.java index 2a36636..1f09af5 100644 --- a/src/de/inetsoftware/jwebassembly/module/WasmConstInstruction.java +++ b/src/de/inetsoftware/jwebassembly/module/WasmConstInstruction.java @@ -21,6 +21,7 @@ import java.io.IOException; import javax.annotation.Nonnull; import de.inetsoftware.jwebassembly.WasmException; +import de.inetsoftware.jwebassembly.wasm.ValueType; /** * WasmInstruction for constant values. diff --git a/src/de/inetsoftware/jwebassembly/module/WasmConvertInstruction.java b/src/de/inetsoftware/jwebassembly/module/WasmConvertInstruction.java index 7e2e290..5e681ae 100644 --- a/src/de/inetsoftware/jwebassembly/module/WasmConvertInstruction.java +++ b/src/de/inetsoftware/jwebassembly/module/WasmConvertInstruction.java @@ -17,6 +17,8 @@ package de.inetsoftware.jwebassembly.module; import java.io.IOException; +import de.inetsoftware.jwebassembly.wasm.ValueType; + /** * Cast operations for converting one data type to another * diff --git a/src/de/inetsoftware/jwebassembly/module/WasmGlobalInstruction.java b/src/de/inetsoftware/jwebassembly/module/WasmGlobalInstruction.java index 4d4d655..71e70c2 100644 --- a/src/de/inetsoftware/jwebassembly/module/WasmGlobalInstruction.java +++ b/src/de/inetsoftware/jwebassembly/module/WasmGlobalInstruction.java @@ -21,6 +21,7 @@ import java.io.IOException; import javax.annotation.Nonnull; import de.inetsoftware.classparser.Member; +import de.inetsoftware.jwebassembly.wasm.ValueType; /** * WasmInstruction for set and get global variables. diff --git a/src/de/inetsoftware/jwebassembly/module/WasmInstruction.java b/src/de/inetsoftware/jwebassembly/module/WasmInstruction.java index da8d866..c69731e 100644 --- a/src/de/inetsoftware/jwebassembly/module/WasmInstruction.java +++ b/src/de/inetsoftware/jwebassembly/module/WasmInstruction.java @@ -21,6 +21,8 @@ import java.io.IOException; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import de.inetsoftware.jwebassembly.wasm.ValueType; + /** * Base class of all WasmInstruction. * diff --git a/src/de/inetsoftware/jwebassembly/module/WasmLoadStoreInstruction.java b/src/de/inetsoftware/jwebassembly/module/WasmLoadStoreInstruction.java index eca5f5c..e9761b6 100644 --- a/src/de/inetsoftware/jwebassembly/module/WasmLoadStoreInstruction.java +++ b/src/de/inetsoftware/jwebassembly/module/WasmLoadStoreInstruction.java @@ -21,6 +21,8 @@ import java.io.IOException; import javax.annotation.Nonnegative; import javax.annotation.Nonnull; +import de.inetsoftware.jwebassembly.wasm.ValueType; + /** * WasmInstruction for load and store local variables. * diff --git a/src/de/inetsoftware/jwebassembly/module/WasmLocalInstruction.java b/src/de/inetsoftware/jwebassembly/module/WasmLocalInstruction.java index 0d5ee6e..bc51561 100644 --- a/src/de/inetsoftware/jwebassembly/module/WasmLocalInstruction.java +++ b/src/de/inetsoftware/jwebassembly/module/WasmLocalInstruction.java @@ -21,6 +21,8 @@ import java.io.IOException; import javax.annotation.Nonnegative; import javax.annotation.Nonnull; +import de.inetsoftware.jwebassembly.wasm.ValueType; + /** * WasmInstruction for load and store local variables. * diff --git a/src/de/inetsoftware/jwebassembly/module/WasmNopInstruction.java b/src/de/inetsoftware/jwebassembly/module/WasmNopInstruction.java index 9f41756..afeae00 100644 --- a/src/de/inetsoftware/jwebassembly/module/WasmNopInstruction.java +++ b/src/de/inetsoftware/jwebassembly/module/WasmNopInstruction.java @@ -20,6 +20,8 @@ import java.io.IOException; import javax.annotation.Nonnull; +import de.inetsoftware.jwebassembly.wasm.ValueType; + /** * WasmInstruction for nop. * diff --git a/src/de/inetsoftware/jwebassembly/module/WasmNumericInstruction.java b/src/de/inetsoftware/jwebassembly/module/WasmNumericInstruction.java index a945943..0e8aa2d 100644 --- a/src/de/inetsoftware/jwebassembly/module/WasmNumericInstruction.java +++ b/src/de/inetsoftware/jwebassembly/module/WasmNumericInstruction.java @@ -21,6 +21,9 @@ import java.io.IOException; import javax.annotation.Nonnull; import javax.annotation.Nullable; +import de.inetsoftware.jwebassembly.wasm.NumericOperator; +import de.inetsoftware.jwebassembly.wasm.ValueType; + /** * WasmInstruction for numeric operation. * diff --git a/src/de/inetsoftware/jwebassembly/text/TextModuleWriter.java b/src/de/inetsoftware/jwebassembly/text/TextModuleWriter.java index 6239a1b..8e4a01d 100644 --- a/src/de/inetsoftware/jwebassembly/text/TextModuleWriter.java +++ b/src/de/inetsoftware/jwebassembly/text/TextModuleWriter.java @@ -24,13 +24,13 @@ import javax.annotation.Nullable; import de.inetsoftware.classparser.Member; import de.inetsoftware.jwebassembly.JWebAssembly; -import de.inetsoftware.jwebassembly.module.ArrayOperator; import de.inetsoftware.jwebassembly.module.FunctionName; import de.inetsoftware.jwebassembly.module.ModuleWriter; -import de.inetsoftware.jwebassembly.module.NumericOperator; -import de.inetsoftware.jwebassembly.module.ValueType; import de.inetsoftware.jwebassembly.module.ValueTypeConvertion; -import de.inetsoftware.jwebassembly.module.WasmBlockOperator; +import de.inetsoftware.jwebassembly.wasm.ArrayOperator; +import de.inetsoftware.jwebassembly.wasm.NumericOperator; +import de.inetsoftware.jwebassembly.wasm.ValueType; +import de.inetsoftware.jwebassembly.wasm.WasmBlockOperator; /** * Module Writer for text format with S-expressions. diff --git a/src/de/inetsoftware/jwebassembly/module/ArrayOperator.java b/src/de/inetsoftware/jwebassembly/wasm/ArrayOperator.java similarity index 94% rename from src/de/inetsoftware/jwebassembly/module/ArrayOperator.java rename to src/de/inetsoftware/jwebassembly/wasm/ArrayOperator.java index d0df590..7766125 100644 --- a/src/de/inetsoftware/jwebassembly/module/ArrayOperator.java +++ b/src/de/inetsoftware/jwebassembly/wasm/ArrayOperator.java @@ -14,7 +14,7 @@ limitations under the License. */ -package de.inetsoftware.jwebassembly.module; +package de.inetsoftware.jwebassembly.wasm; /** * Operation on Arrays. diff --git a/src/de/inetsoftware/jwebassembly/module/NumericOperator.java b/src/de/inetsoftware/jwebassembly/wasm/NumericOperator.java similarity index 95% rename from src/de/inetsoftware/jwebassembly/module/NumericOperator.java rename to src/de/inetsoftware/jwebassembly/wasm/NumericOperator.java index 07cf21c..a25b9f8 100644 --- a/src/de/inetsoftware/jwebassembly/module/NumericOperator.java +++ b/src/de/inetsoftware/jwebassembly/wasm/NumericOperator.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.inetsoftware.jwebassembly.module; +package de.inetsoftware.jwebassembly.wasm; /** * @author Volker Berlin diff --git a/src/de/inetsoftware/jwebassembly/module/ValueType.java b/src/de/inetsoftware/jwebassembly/wasm/ValueType.java similarity index 97% rename from src/de/inetsoftware/jwebassembly/module/ValueType.java rename to src/de/inetsoftware/jwebassembly/wasm/ValueType.java index ed3728e..5d6fc9c 100644 --- a/src/de/inetsoftware/jwebassembly/module/ValueType.java +++ b/src/de/inetsoftware/jwebassembly/wasm/ValueType.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.inetsoftware.jwebassembly.module; +package de.inetsoftware.jwebassembly.wasm; import de.inetsoftware.jwebassembly.WasmException; diff --git a/src/de/inetsoftware/jwebassembly/module/ValueTypeParser.java b/src/de/inetsoftware/jwebassembly/wasm/ValueTypeParser.java similarity index 98% rename from src/de/inetsoftware/jwebassembly/module/ValueTypeParser.java rename to src/de/inetsoftware/jwebassembly/wasm/ValueTypeParser.java index c94b0cd..5dd344a 100644 --- a/src/de/inetsoftware/jwebassembly/module/ValueTypeParser.java +++ b/src/de/inetsoftware/jwebassembly/wasm/ValueTypeParser.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package de.inetsoftware.jwebassembly.module; +package de.inetsoftware.jwebassembly.wasm; import de.inetsoftware.jwebassembly.WasmException; diff --git a/src/de/inetsoftware/jwebassembly/module/WasmBlockOperator.java b/src/de/inetsoftware/jwebassembly/wasm/WasmBlockOperator.java similarity index 95% rename from src/de/inetsoftware/jwebassembly/module/WasmBlockOperator.java rename to src/de/inetsoftware/jwebassembly/wasm/WasmBlockOperator.java index c07cd85..0571054 100644 --- a/src/de/inetsoftware/jwebassembly/module/WasmBlockOperator.java +++ b/src/de/inetsoftware/jwebassembly/wasm/WasmBlockOperator.java @@ -14,7 +14,7 @@ limitations under the License. */ -package de.inetsoftware.jwebassembly.module; +package de.inetsoftware.jwebassembly.wasm; /** * Block operators in the WASM byte code. diff --git a/src/de/inetsoftware/jwebassembly/watparser/WatParser.java b/src/de/inetsoftware/jwebassembly/watparser/WatParser.java index 1a9bcfb..ce38fb6 100644 --- a/src/de/inetsoftware/jwebassembly/watparser/WatParser.java +++ b/src/de/inetsoftware/jwebassembly/watparser/WatParser.java @@ -24,11 +24,11 @@ import javax.annotation.Nonnull; import javax.annotation.Nullable; import de.inetsoftware.jwebassembly.WasmException; -import de.inetsoftware.jwebassembly.module.NumericOperator; -import de.inetsoftware.jwebassembly.module.ValueType; import de.inetsoftware.jwebassembly.module.ValueTypeConvertion; -import de.inetsoftware.jwebassembly.module.WasmBlockOperator; import de.inetsoftware.jwebassembly.module.WasmCodeBuilder; +import de.inetsoftware.jwebassembly.wasm.NumericOperator; +import de.inetsoftware.jwebassembly.wasm.ValueType; +import de.inetsoftware.jwebassembly.wasm.WasmBlockOperator; /** * Parser for text format of a function.