add sourceFile to WasmException

src/de/inetsoftware/jwebassembly/WasmException.java

@@ -23,18 +23,23 @@ package de.inetsoftware.jwebassembly;
  */
 public class WasmException extends Exception {
 
-    private int lineNumber;
+    private int    lineNumber;
+
+    private String sourceFile;
 
     /**
      * Create a new instance.
      * 
      * @param message
      *            the error message
+     * @param sourceFile
+     *            the sourceFile of the Java code
      * @param lineNumber
      *            the line number in Java Code
      */
-    public WasmException( String message, int lineNumber ) {
+    public WasmException( String message, String sourceFile, int lineNumber ) {
         super( message );
+        this.sourceFile = sourceFile;
         this.lineNumber = lineNumber;
     }
 
@@ -54,12 +59,17 @@ public class WasmException extends Exception {
      * 
      * @param cause
      *            the wrapped cause
+     * @param sourceFile
+     *            the sourceFile of the Java code
      * @param lineNumber
      *            the line number in Java Code
      * @return a new instance
      */
-    public static WasmException create( Throwable cause, int lineNumber ) {
+    public static WasmException create( Throwable cause, String sourceFile, int lineNumber ) {
         WasmException wasmEx = create( cause );
+        if( wasmEx.sourceFile == null ) {
+            wasmEx.sourceFile = sourceFile;
+        }
         if( wasmEx.lineNumber < 0 ) {
             wasmEx.lineNumber = lineNumber;
         }
@@ -95,8 +105,11 @@ public class WasmException extends Exception {
     @Override
     public String toString() {
         String str = super.toString();
-        if( lineNumber > 0 ) {
-            str += " at line: " + lineNumber;
+        if( sourceFile != null || lineNumber > 0 ) {
+            str += " at " + (sourceFile != null ? sourceFile : "line");
+            if( lineNumber > 0 ) {
+                str += ":" + lineNumber;
+            }
         }
         return str;
     }

src/de/inetsoftware/jwebassembly/module/ModuleWriter.java

@@ -44,6 +44,8 @@ public abstract class ModuleWriter implements Closeable {
 
     private ArrayList<ValueType> locals = new ArrayList<>();
 
+    private String               sourceFile;
+
     /**
      * Write the content of the class to the
      * 
@@ -55,6 +57,10 @@ public abstract class ModuleWriter implements Closeable {
      *             if some Java code can't converted
      */
     public void write( ClassFile classFile ) throws IOException, WasmException {
+        sourceFile = classFile.getSourceFile();
+        if( sourceFile == null ) {
+            sourceFile = classFile.getThisClass().getName();
+        }
         MethodInfo[] methods = classFile.getMethods();
         for( MethodInfo method : methods ) {
             Code code = method.getCode();
@@ -201,7 +207,7 @@ public abstract class ModuleWriter implements Closeable {
                     javaType = signature.substring( i, i + 1 );
             }
             int lineNumber = method.getCode().getFirstLineNr();
-            throw new WasmException( "Not supported Java data type in method signature: " + javaType, lineNumber );
+            throw new WasmException( "Not supported Java data type in method signature: " + javaType, sourceFile, lineNumber );
         }
     }
 
@@ -235,6 +241,8 @@ public abstract class ModuleWriter implements Closeable {
      *            a stream of byte code
      * @param lineNumber
      *            the current line number
+     * @param constantPool
+     *            the constant pool of the the current class
      * @throws WasmException
      *             if some Java code can't converted
      */
@@ -278,14 +286,24 @@ public abstract class ModuleWriter implements Closeable {
                         writeReturn();
                         break;
                     default:
-                        throw new WasmException( "Unimplemented byte code operation: " + op, lineNumber );
+                        throw new WasmException( "Unimplemented byte code operation: " + op, sourceFile, lineNumber );
                 }
             }
         } catch( Exception ex ) {
-            throw WasmException.create( ex, lineNumber );
+            throw WasmException.create( ex, sourceFile, lineNumber );
         }
     }
 
+    /**
+     * Write a constant value.
+     * 
+     * @param value
+     *            the value
+     * @throws IOException
+     *             if any I/O error occur
+     * @throws WasmException
+     *             if the value type is not supported
+     */
     private void writeConst( Object value ) throws IOException, WasmException {
         Class<?> clazz = value.getClass();
         if( clazz == Integer.class ) {
@@ -297,7 +315,7 @@ public abstract class ModuleWriter implements Closeable {
         } else if( clazz == Double.class ) {
             writeConstDouble( ((Double)value).doubleValue() );
         } else {
-            throw new WasmException( "Not supported constant type: " + clazz, -1 );
+            throw new WasmException( "Not supported constant type: " + clazz, sourceFile, -1 );
         }
     }
 
@@ -361,7 +379,7 @@ public abstract class ModuleWriter implements Closeable {
         }
         ValueType oldType = locals.get( idx );
         if( oldType != null && oldType != valueType ) {
-            throw new WasmException( "Redefine local variable type from " + oldType + " to " + valueType, -1 );
+            throw new WasmException( "Redefine local variable type from " + oldType + " to " + valueType, sourceFile, -1 );
         }
         locals.set( idx, valueType );
         if( load ) {