Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@95093 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
rbs%maths.uq.edu.au 2001-05-16 02:49:24 +00:00
parent 260a41ecbf
commit 829a60bdeb
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
mozilla/htmlparser/src/nsExpatTokenizer.cpp
View File

@ -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);

1
mozilla/htmlparser/src/nsParserError.h
View File

@ -41,6 +41,7 @@ typedef struct _nsParserError {
PRInt32 colNumber;
nsString description;
nsString sourceLine;
nsString sourceURL;
} nsParserError;
#endif

3
mozilla/parser/htmlparser/src/nsExpatTokenizer.cpp
View File

@ -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);

1
mozilla/parser/htmlparser/src/nsParserError.h
View File

@ -41,6 +41,7 @@ typedef struct _nsParserError {
PRInt32 colNumber;
nsString description;
nsString sourceLine;
nsString sourceURL;
} nsParserError;
#endif