/* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
 *
 * The contents of this file are subject to the Netscape Public
 * License Version 1.1 (the "License"); you may not use this file
 * except in compliance with the License. You may obtain a copy of
 * the License at http://www.mozilla.org/NPL/
 *
 * Software distributed under the License is distributed on an "AS
 * IS" basis, WITHOUT WARRANTY OF ANY KIND, either express oqr
 * implied. See the License for the specific language governing
 * rights and limitations under the License.
 *
 * The Original Code is Rhino code, released
 * May 6, 1999.
 *
 * The Initial Developer of the Original Code is Netscape
 * Communications Corporation.  Portions created by Netscape are
 * Copyright (C) 1997-1999 Netscape Communications Corporation. All
 * Rights Reserved.
 *
 * Contributor(s): 
 * Roger Lawrence
 * 
 * Alternatively, the contents of this file may be used under the
 * terms of the GNU Public License (the "GPL"), in which case the
 * provisions of the GPL are applicable instead of those above.
 * If you wish to allow use of your version of this file only
 * under the terms of the GPL and not to allow others to use your
 * version of this file under the NPL, indicate your decision by
 * deleting the provisions above and replace them with the notice
 * and other provisions required by the GPL.  If you do not delete
 * the provisions above, a recipient may use your version of this
 * file under either the NPL or the GPL.
 */

// API class

package org.mozilla.javascript;

/**
 * The class of exceptions raised by the engine as described in 
 * ECMA edition 3. See section 15.11.6 in particular.
 */
public class EcmaError extends RuntimeException {

    /**
     * Create an exception with the specified detail message.
     *
     * Errors internal to the JavaScript engine will simply throw a
     * RuntimeException.
     *
     * @param nativeError the NativeError object constructed for this error
     * @param sourceName the name of the source reponsible for the error
     * @param lineNumber the line number of the source
     * @param columnNumber the columnNumber of the source (may be zero if
     *                     unknown)
     * @param lineSource the source of the line containing the error (may be 
     *                   null if unknown)
     */
    public EcmaError(NativeError nativeError, String sourceName, 
                     int lineNumber, int columnNumber, String lineSource) 
    {
        super("EcmaError");
        errorObject = nativeError;
        this.sourceName = sourceName;
        this.lineNumber = lineNumber;
        this.columnNumber = columnNumber;
        this.lineSource = lineSource;
    }
    
    /**
     * Return a string representation of the error, which currently consists 
     * of the name of the error together with the message.
     */
    public String toString() {
        if (sourceName != null && lineNumber > 0)
            return errorObject.toString() + " (" + sourceName + 
               "; line " + lineNumber + ")";
        else
            return errorObject.toString();
    }
    
    /**
     * Gets the name of the error.
     * 
     * ECMA edition 3 defines the following
     * errors: EvalError, RangeError, ReferenceError, 
     * SyntaxError, TypeError, and URIError. Additional error names
     * may be added in the future.
     * 
     * See ECMA edition 3, 15.11.7.9.
     * 
     * @return the name of the error. 
     */
    public String getName() {
        return errorObject.getName();
    }
    
    /**
     * Gets the message corresponding to the error.
     * 
     * See ECMA edition 3, 15.11.7.10.
     * 
     * @return an implemenation-defined string describing the error.
     */
    public String getMessage() {
        return errorObject.getMessage();
    }
    
    /**
     * Get the name of the source containing the error, or null
     * if that information is not available.
     */
    public String getSourceName() {
        return sourceName;
    }
    
    /**
     * Returns the line number of the statement causing the error,
     * or zero if not available.
     */
    public int getLineNumber() {
        return lineNumber;
    }
    
    /**
     * Get the error object corresponding to this exception.
     */
    public Scriptable getErrorObject() {
        return errorObject;
    }
    
    /**
     * The column number of the location of the error, or zero if unknown.
     */
    public int getColumnNumber() {
        return columnNumber;
    }
    
    /**
     * The source of the line causing the error, or zero if unknown.
     */
    public String getLineSource() {
        return lineSource;
    }
    
    private NativeError errorObject;
    private String sourceName;
    private int lineNumber;
    private int columnNumber;
    private String lineSource;
}

@@ -2948,9 +2948,9 @@
 ame 
-!
+=
 = nu
@@ -2970,9 +2970,10 @@
 ber 
-%3E
+%3C=
  0)%0A
@@ -3017,18 +3017,139 @@
 ng()
- + %22 (%22 + 
+;%0A        StringBuffer buf = new StringBuffer();%0A        buf.append(errorObject.toString());%0A        buf.append(%22 (%22);%0A        if (
 sour
@@ -3155,18 +3155,26 @@
 rceName 
-+ 
+!= null) %7B
 %0A       
@@ -3182,39 +3182,133 @@
     
-   %22; line %22 + lineNumber +
+buf.append(sourceName);%0A            buf.append(%22; %22);%0A        %7D%0A        if (lineNumber %3E 0) %7B%0A            buf.append(%22line
  %22)
-%22
 ;%0A  
@@ -3317,17 +3317,71 @@
     
-else%0A    
+    buf.append(lineNumber);%0A        %7D%0A        buf.append(')');%0A
     
@@ -3387,35 +3387,27 @@
      return 
-errorObject
+buf
 .toString();

Print either line or file name if either is present.