backup/JWebAssembly
1
0
Fork 0
mirror of https://github.com/i-net-software/JWebAssembly.git synced 2025-03-25 07:27:52 +01:00
Code Issues Projects Releases Activity

improve error message

Browse Source
This commit is contained in:
Volker Berlin 2019-08-04 19:29:36 +02:00
parent fd24d852ee
commit c66d7748a4
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/de/inetsoftware/jwebassembly/module/TypeManager.java
View File

@ -19,7 +19,6 @@ package de.inetsoftware.jwebassembly.module;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -48,6 +47,8 @@ public class TypeManager {
private Map<String, StructType> map = new LinkedHashMap<>(); private Map<String, StructType> map = new LinkedHashMap<>();
private boolean isFinish;
/** /**
* Finish the prepare and write the types. Now no new types and functions should be added. * Finish the prepare and write the types. Now no new types and functions should be added.
* *
@ -61,7 +62,7 @@ public class TypeManager {
* if any I/O error occur on loading or writing * if any I/O error occur on loading or writing
*/ */
void prepareFinish( ModuleWriter writer, FunctionManager functions, ClassLoader libraries ) throws IOException { void prepareFinish( ModuleWriter writer, FunctionManager functions, ClassLoader libraries ) throws IOException {
map = Collections.unmodifiableMap( map ); isFinish = true;
for( StructType type : map.values() ) { for( StructType type : map.values() ) {
type.writeStructType( writer, functions, this, libraries ); type.writeStructType( writer, functions, this, libraries );
} }
@ -103,6 +104,9 @@ public class TypeManager {
StructType type = map.get( name ); StructType type = map.get( name );
if( type == null ) { if( type == null ) {
JWebAssembly.LOGGER.fine( "\t\ttype: " + name ); JWebAssembly.LOGGER.fine( "\t\ttype: " + name );
if( isFinish ) {
throw new WasmException( "Register needed type after scanning: " + name, -1 );
}
type = new StructType( name ); type = new StructType( name );
map.put( name, type ); map.put( name, type );
} }
@ -154,6 +158,7 @@ public class TypeManager {
* if any I/O error occur on loading or writing * if any I/O error occur on loading or writing
*/ */
private void writeStructType( ModuleWriter writer, FunctionManager functions, TypeManager types, ClassLoader libraries ) throws IOException { private void writeStructType( ModuleWriter writer, FunctionManager functions, TypeManager types, ClassLoader libraries ) throws IOException {
JWebAssembly.LOGGER.fine( "write type: " + name );
fields = new ArrayList<>(); fields = new ArrayList<>();
methods = new ArrayList<>(); methods = new ArrayList<>();
listStructFields( name, functions, types, libraries ); listStructFields( name, functions, types, libraries );