Report the name of the faulty file when there is an XML parsing error. Useful for popup windows or XUL files. b=47416 r=heikki sr=jst

htmlparser/src/nsExpatTokenizer.cpp

@@ -303,6 +303,8 @@ CreateErrorText(const nsParserError* aError, nsString& aErrorString)
 
   if (aError) {
     aErrorString.Append(aError->description);
+    aErrorString.AppendWithConversion("\nLocation: ");
+    aErrorString.Append(aError->sourceURL);
     aErrorString.AppendWithConversion("\nLine Number ");
     aErrorString.AppendInt(aError->lineNumber, 10);
     aErrorString.AppendWithConversion(", Column ");
@@ -402,6 +404,7 @@ nsExpatTokenizer::PushXMLErrorTokens(const char *aBuffer, PRUint32 aLength, PRBo
     // Adjust the column number so that it is one based rather than zero based.
     error->colNumber = XML_GetCurrentColumnNumber(mExpatParser) + 1;
     error->description.AssignWithConversion(XML_ErrorString(error->code));
+    error->sourceURL = mState->scanner->GetFilename();
     if (!aIsFinal) {
       PRInt32 byteIndexRelativeToFile = 0;
       byteIndexRelativeToFile = XML_GetCurrentByteIndex(mExpatParser);

htmlparser/src/nsParserError.h

@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * 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 or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-
-/**
- * MODULE NOTES:
- * @update  nra 3/3/99
- * 
- * nsParserError structifies the notion of a parser error.
- */
-
-
-#ifndef PARSERERROR__
-#define PARSERERROR__
-
-#include "prtypes.h"
-#include "nsString.h"
-
-typedef struct _nsParserError {
-  PRInt32 code;
-  PRInt32 lineNumber;
-  PRInt32 colNumber;  
-  nsString description;  
-  nsString sourceLine;
-} nsParserError;
-
-#endif
-
-

parser/htmlparser/src/nsExpatTokenizer.cpp

@@ -303,6 +303,8 @@ CreateErrorText(const nsParserError* aError, nsString& aErrorString)
 
   if (aError) {
     aErrorString.Append(aError->description);
+    aErrorString.AppendWithConversion("\nLocation: ");
+    aErrorString.Append(aError->sourceURL);
     aErrorString.AppendWithConversion("\nLine Number ");
     aErrorString.AppendInt(aError->lineNumber, 10);
     aErrorString.AppendWithConversion(", Column ");
@@ -402,6 +404,7 @@ nsExpatTokenizer::PushXMLErrorTokens(const char *aBuffer, PRUint32 aLength, PRBo
     // Adjust the column number so that it is one based rather than zero based.
     error->colNumber = XML_GetCurrentColumnNumber(mExpatParser) + 1;
     error->description.AssignWithConversion(XML_ErrorString(error->code));
+    error->sourceURL = mState->scanner->GetFilename();
     if (!aIsFinal) {
       PRInt32 byteIndexRelativeToFile = 0;
       byteIndexRelativeToFile = XML_GetCurrentByteIndex(mExpatParser);

parser/htmlparser/src/nsParserError.h

@@ -1,48 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/*
- * 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 or
- * implied. See the License for the specific language governing
- * rights and limitations under the License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is Netscape
- * Communications Corporation.  Portions created by Netscape are
- * Copyright (C) 1998 Netscape Communications Corporation. All
- * Rights Reserved.
- *
- * Contributor(s): 
- */
-
-
-/**
- * MODULE NOTES:
- * @update  nra 3/3/99
- * 
- * nsParserError structifies the notion of a parser error.
- */
-
-
-#ifndef PARSERERROR__
-#define PARSERERROR__
-
-#include "prtypes.h"
-#include "nsString.h"
-
-typedef struct _nsParserError {
-  PRInt32 code;
-  PRInt32 lineNumber;
-  PRInt32 colNumber;  
-  nsString description;  
-  nsString sourceLine;
-} nsParserError;
-
-#endif
-
-