reorganize

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/

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.

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.

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

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

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.

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

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;
 
 /**

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.

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.

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.
  * 

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.

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.

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.

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
  * 

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.

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.
  * 

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.
  * 

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.
  * 

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.
  * 

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.
  * 

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.

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.

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

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;
 

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;
 

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.

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.