mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 129608, moving XML parsererror into its own namespace along with the CSS rules so it won't mess up with web pages using parsererror and sourcetext tags. Clean up the content tree before parser error. Also removing dead files. r=harishd, sr=jst, a=roc+moz@cs.cmu.edu.

This commit is contained in:
heikki%netscape.com 2002-03-12 22:17:18 +00:00
Родитель fa6c821fe5
Коммит bf57164cba
16 изменённых файлов: 30 добавлений и 4377 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

24
content/xml/document/src/nsXMLContentSink.cpp
Просмотреть файл

@ -1587,13 +1587,26 @@ nsXMLContentSink::ReportError(const PRUnichar* aErrorText,
{
nsresult rv = NS_OK;
mState = eXMLContentSinkState_InProlog;
// Clear the current content and
// prepare to set <parsererror> as the document root
nsCOMPtr<nsIDOMNode> node(do_QueryInterface(mDocument));
if (node) {
for (;;) {
nsCOMPtr<nsIDOMNode> child, dummy;
node->GetLastChild(getter_AddRefs(child));
if (!child)
break;
node->RemoveChild(child, getter_AddRefs(dummy));
}
}
NS_IF_RELEASE(mDocElement);
NS_NAMED_LITERAL_STRING(name, "xmlns");
NS_NAMED_LITERAL_STRING(value, "http://www.w3.org/1999/xhtml");
NS_NAMED_LITERAL_STRING(value, "http://www.mozilla.org/newlayout/xml/parsererror.xml");
const PRUnichar* atts[] = {name.get(), value.get(), nsnull};
mState = eXMLContentSinkState_InProlog;
NS_IF_RELEASE(mDocElement); // Do this inorder to set the <parsererror> as the document root
rv = HandleStartElement(NS_LITERAL_STRING("parsererror").get(), atts, 1, -1, -1);
NS_ENSURE_SUCCESS(rv,rv);
@ -1601,7 +1614,8 @@ nsXMLContentSink::ReportError(const PRUnichar* aErrorText,
rv = HandleCharacterData(aErrorText, nsCRT::strlen(aErrorText));
NS_ENSURE_SUCCESS(rv,rv);
rv = HandleStartElement(NS_LITERAL_STRING("sourcetext").get(), atts, 1, -1, -1);
const PRUnichar* noAtts[] = {0, 0};
rv = HandleStartElement(NS_LITERAL_STRING("sourcetext").get(), noAtts, 0, -1, -1);
NS_ENSURE_SUCCESS(rv,rv);
rv = HandleCharacterData(aSourceText, nsCRT::strlen(aSourceText));

5
content/xul/document/src/nsXULContentSink.cpp
Просмотреть файл

@ -1153,7 +1153,7 @@ XULContentSinkImpl::ReportError(const PRUnichar* aErrorText,
mState = eInProlog;
NS_NAMED_LITERAL_STRING(name, "xmlns");
NS_NAMED_LITERAL_STRING(value, "http://www.w3.org/1999/xhtml");
NS_NAMED_LITERAL_STRING(value, "http://www.mozilla.org/newlayout/xml/parsererror.xml");
const PRUnichar* atts[] = {name.get(), value.get(), nsnull};;
@ -1163,7 +1163,8 @@ XULContentSinkImpl::ReportError(const PRUnichar* aErrorText,
rv = HandleCharacterData(aErrorText, nsCRT::strlen(aErrorText));
NS_ENSURE_SUCCESS(rv,rv);
rv = HandleStartElement(NS_LITERAL_STRING("sourcetext").get(), atts, 1, -1, -1);
const PRUnichar* noAtts[] = {0, 0};
rv = HandleStartElement(NS_LITERAL_STRING("sourcetext").get(), noAtts, 0, -1, -1);
NS_ENSURE_SUCCESS(rv,rv);
rv = HandleCharacterData(aSourceText, nsCRT::strlen(aSourceText));

1
htmlparser/public/MANIFEST
Просмотреть файл

@ -10,7 +10,6 @@ nsIParserNode.h
nsIParserFilter.h
nsIParser.h
nsIDTD.h
nsIExpatTokenizer.h
nsIElementObserver.h
nsIParserService.h
nsHTMLTags.h

77
htmlparser/public/nsIExpatTokenizer.h
Просмотреть файл

@ -1,77 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
* 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 the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the NPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/**
* MODULE NOTES:
* @update nra 2/24/99
*
*/
#ifndef __NSIEXPATTOKENIZER__
#define __NSIEXPATTOKENIZER__
#include "nsISupports.h"
#include "prtypes.h"
#include "xmlparse.h"
class CToken;
class nsScanner;
#define NS_IEXPATTOKENIZER_IID \
{0xf86a4380, 0xce17, 0x11d2, {0x80, 0x3f, 0x00, 0x60, 0x08, 0x98, 0x28, 0x77}}
class nsIExpatTokenizer : public nsITokenizer {
public:
/* Methods for setting callbacks on the expat parser */
virtual void SetElementHandler(XML_StartElementHandler start, XML_EndElementHandler end)=0;
virtual void SetCharacterDataHandler(XML_CharacterDataHandler handler)=0;
virtual void SetProcessingInstructionHandler(XML_ProcessingInstructionHandler handler)=0;
virtual void SetDefaultHandler(XML_DefaultHandler handler)=0;
virtual void SetUnparsedEntityDeclHandler(XML_UnparsedEntityDeclHandler handler)=0;
virtual void SetNotationDeclHandler(XML_NotationDeclHandler handler)=0;
virtual void SetExternalEntityRefHandler(XML_ExternalEntityRefHandler handler)=0;
virtual void SetUnknownEncodingHandler(XML_UnknownEncodingHandler handler, void *encodingHandlerData)=0;
virtual void FrontloadMisplacedContent(nsDeque& aDeque)=0;
};
#endif

1016
htmlparser/src/nsExpatTokenizer.cpp
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

208
htmlparser/src/nsExpatTokenizer.h
Просмотреть файл

@ -1,208 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
* 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 the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the NPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/**
* MODULE NOTES:
* @update gess 4/1/98
*
*/
#ifndef __nsExpatTokenizer
#define __nsExpatTokenizer
#include "nsISupports.h"
#include "nsHTMLTokenizer.h"
#include "prtypes.h"
// Enable unicode characters in expat.
#define UNICODE
#include "xmlparse.h"
#define NS_EXPATTOKENIZER_IID \
{0x483836aa, 0xcabe, 0x11d2, { 0xab, 0xcb, 0x0, 0x10, 0x4b, 0x98, 0x3f, 0xd4 }}
// {575C063A-AE9C-11d3-B9FD-001083023C0E}
#define NS_EXPATTOKENIZER_CID \
{ 0x575c063a, 0xae9c, 0x11d3, \
{0xb9, 0xfd, 0x0, 0x10, 0x83, 0x2, 0x3c, 0xe}}
typedef struct _XMLParserState XMLParserState;
/***************************************************************
Notes:
***************************************************************/
#if defined(XP_PC)
#pragma warning( disable : 4275 )
#endif
#ifdef __cplusplus
extern "C" {
#endif
/* The callback handlers that get called from the expat parser */
void Tokenizer_HandleStartElement(void *userData, const XML_Char *name, const XML_Char **atts);
void Tokenizer_HandleEndElement(void *userData, const XML_Char *name);
void Tokenizer_HandleCharacterData(void *userData, const XML_Char *s, int len);
void Tokenizer_HandleComment(void *userData, const XML_Char *name);
void Tokenizer_HandleProcessingInstruction(void *userData,
const XML_Char *target,
const XML_Char *data);
void Tokenizer_HandleDefault(void *userData, const XML_Char *s, int len);
void Tokenizer_HandleStartCdataSection(void *userData);
void Tokenizer_HandleEndCdataSection(void *userData);
void Tokenizer_HandleUnparsedEntityDecl(void *userData,
const XML_Char *entityName,
const XML_Char *base,
const XML_Char *systemId,
const XML_Char *publicId,
const XML_Char *notationName);
void Tokenizer_HandleNotationDecl(void *userData,
const XML_Char *notationName,
const XML_Char *base,
const XML_Char *systemId,
const XML_Char *publicId);
int Tokenizer_HandleExternalEntityRef(XML_Parser parser,
const XML_Char *openEntityNames,
const XML_Char *base,
const XML_Char *systemId,
const XML_Char *publicId);
int Tokenizer_HandleUnknownEncoding(void *encodingHandlerData,
const XML_Char *name,
XML_Encoding *info);
void Tokenizer_HandleStartDoctypeDecl(void *userData,
const XML_Char *doctypeName);
void Tokenizer_HandleEndDoctypeDecl(void *userData);
#ifdef __cplusplus
}
#endif
class nsExpatTokenizer : public nsHTMLTokenizer {
public:
nsExpatTokenizer(nsString* aURL = nsnull);
virtual ~nsExpatTokenizer();
virtual const nsIID& GetCID();
static const nsIID& GetIID();
NS_DECL_ISUPPORTS
/* nsITokenizer methods */
virtual nsresult WillTokenize(PRBool aIsFinalChunk,nsTokenAllocator* aTokenAllocator);
virtual nsresult ConsumeToken(nsScanner& aScanner,PRBool& aFlushTokens);
virtual nsresult DidTokenize(PRBool aIsFinalChunk);
virtual void FrontloadMisplacedContent(nsDeque& aDeque);
protected:
/**
* Parse an XML buffer using expat
* @update nra 2/29/99
* @return NS_ERROR_FAILURE if expat encounters an error, else NS_OK
*/
nsresult ParseXMLBuffer(const char *aBuffer, PRUint32 aLength, PRBool aIsFinal=PR_FALSE);
/**
* Sets up the callbacks and user data for the expat parser
* @update nra 2/24/99
* @param none
* @return none
*/
void SetupExpatParser(void);
// Propagate XML errors to the content sink
nsresult PushXMLErrorTokens(const char *aBuffer, PRUint32 aLength, PRBool aIsFinal);
nsresult AddErrorMessageTokens(nsParserError* aError);
void GetLine(const char* aSourceBuffer, PRUint32 aLength,
PRUint32 aByteIndex, nsString& aLine);
// Load up an external stream to get external entity information
static nsresult OpenInputStream(const XML_Char* aURLStr,
const XML_Char* aBaseURL,
nsIInputStream** in,
nsString* aAbsURL);
static nsresult LoadStream(nsIInputStream* in,
PRUnichar* &uniBuf,
PRUint32 &retLen);
/* The callback handlers that get called from the expat parser */
friend void Tokenizer_HandleStartElement(void *userData, const XML_Char *name, const XML_Char **atts);
friend void Tokenizer_HandleEndElement(void *userData, const XML_Char *name);
friend void Tokenizer_HandleCharacterData(void *userData, const XML_Char *s, int len);
friend void Tokenizer_HandleComment(void *userData, const XML_Char *name);
friend void Tokenizer_HandleProcessingInstruction(void *userData,
const XML_Char *target,
const XML_Char *data);
friend void Tokenizer_HandleDefault(void *userData, const XML_Char *s, int len);
friend void Tokenizer_HandleStartCdataSection(void *userData);
friend void Tokenizer_HandleEndCdataSection(void *userData);
friend void Tokenizer_HandleUnparsedEntityDecl(void *userData,
const XML_Char *entityName,
const XML_Char *base,
const XML_Char *systemId,
const XML_Char *publicId,
const XML_Char *notationName);
friend void Tokenizer_HandleNotationDecl(void *userData,
const XML_Char *notationName,
const XML_Char *base,
const XML_Char *systemId,
const XML_Char *publicId);
friend int Tokenizer_HandleExternalEntityRef(XML_Parser parser,
const XML_Char *openEntityNames,
const XML_Char *base,
const XML_Char *systemId,
const XML_Char *publicId);
friend int Tokenizer_HandleUnknownEncoding(void *encodingHandlerData,
const XML_Char *name,
XML_Encoding *info);
friend void Tokenizer_HandleStartDoctypeDecl(void *userData,
const XML_Char *doctypeName);
friend void Tokenizer_HandleEndDoctypeDecl(void *userData);
XML_Parser mExpatParser;
PRUint32 mBytesParsed;
nsString mLastLine;
XMLParserState* mState;
};
#endif

784
htmlparser/src/nsWellFormedDTD.cpp
Просмотреть файл

@ -1,784 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
* 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 the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the NPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/**
* MODULE NOTES:
* @update gess 4/8/98
*
*
*/
#include "nsWellFormedDTD.h"
#include "nsCRT.h"
#include "nsParser.h"
#include "nsScanner.h"
#include "nsIParser.h"
#include "nsDTDUtils.h"
#include "nsIContentSink.h"
#include "nsIHTMLContentSink.h"
#include "nsHTMLTokenizer.h"
#include "nsExpatTokenizer.h"
#include "prenv.h" //this is here for debug reasons...
#include "prtypes.h" //this is here for debug reasons...
#include "prio.h"
#include "plstr.h"
#include "prprf.h"
#include "prmem.h"
#include "nsSpecialSystemDirectory.h"
#include <ctype.h> // toupper()
#include "nsString.h"
#include "nsReadableUtils.h"
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIDTDIID, NS_IDTD_IID);
static NS_DEFINE_IID(kClassIID, NS_WELLFORMED_DTD_IID);
/**
* This method gets called as part of our COM-like interfaces.
* Its purpose is to create an interface to parser object
* of some type.
*
* @update gess 4/8/98
* @param nsIID id of object to discover
* @param aInstancePtr ptr to newly discovered interface
* @return NS_xxx result code
*/
nsresult CWellFormedDTD::QueryInterface(const nsIID& aIID, void** aInstancePtr)
{
if (NULL == aInstancePtr) {
return NS_ERROR_NULL_POINTER;
}
if(aIID.Equals(kISupportsIID)) { //do IUnknown...
*aInstancePtr = (nsIDTD*)(this);
}
else if(aIID.Equals(kIDTDIID)) { //do IParser base class...
*aInstancePtr = (nsIDTD*)(this);
}
else if(aIID.Equals(kClassIID)) { //do this class...
*aInstancePtr = (CWellFormedDTD*)(this);
}
else {
*aInstancePtr=0;
return NS_NOINTERFACE;
}
NS_ADDREF_THIS();
return NS_OK;
}
/**
* This method is defined in nsIParser. It is used to
* cause the COM-like construction of an nsParser.
*
* @update gess 4/8/98
* @param nsIParser** ptr to newly instantiated parser
* @return NS_xxx error result
*/
nsresult NS_NewWellFormed_DTD(nsIDTD** aInstancePtrResult)
{
CWellFormedDTD* it = new CWellFormedDTD();
if (it == 0) {
return NS_ERROR_OUT_OF_MEMORY;
}
return it->QueryInterface(kClassIID, (void **) aInstancePtrResult);
}
NS_IMPL_ADDREF(CWellFormedDTD)
NS_IMPL_RELEASE(CWellFormedDTD)
/**
* Default constructor
*
* @update gess 4/9/98
* @param
* @return
*/
CWellFormedDTD::CWellFormedDTD() : nsIDTD() {
NS_INIT_REFCNT();
mParser=0;
mSink=0;
mLineNumber=1;
mTokenizer=0;
mDTDState=NS_OK;
}
/**
* Default destructor
*
* @update gess 4/9/98
* @param
* @return
*/
CWellFormedDTD::~CWellFormedDTD(){
mParser=0; //just to prove we destructed...
NS_IF_RELEASE(mTokenizer);
}
/**
*
* @update gess1/8/99
* @param
* @return
*/
const nsIID& CWellFormedDTD::GetMostDerivedIID(void) const{
return kClassIID;
}
/**
* Call this method if you want the DTD to construct a fresh
* instance of itself.
* @update gess7/23/98
* @param
* @return
*/
nsresult CWellFormedDTD::CreateNewInstance(nsIDTD** aInstancePtrResult){
return NS_NewWellFormed_DTD(aInstancePtrResult);
}
/**
* This method is called to determine if the given DTD can parse
* a document in a given source-type.
* NOTE: Parsing always assumes that the end result will involve
* storing the result in the main content model.
* @update gess6/24/98
* @param
* @return TRUE if this DTD can satisfy the request; FALSE otherwise.
*/
NS_IMETHODIMP_(eAutoDetectResult)
CWellFormedDTD::CanParse(CParserContext& aParserContext,
const nsString& aBuffer, PRInt32 aVersion)
{
eAutoDetectResult result=eUnknownDetect;
if(eViewSource!=aParserContext.mParserCommand) {
if(aParserContext.mMimeType.EqualsWithConversion(kXMLTextContentType) ||
aParserContext.mMimeType.EqualsWithConversion(kXMLApplicationContentType) ||
aParserContext.mMimeType.EqualsWithConversion(kXHTMLApplicationContentType) ||
aParserContext.mMimeType.EqualsWithConversion(kRDFTextContentType) ||
aParserContext.mMimeType.EqualsWithConversion(kXULTextContentType)
#ifdef MOZ_SVG
|| aParserContext.mMimeType.Equals(NS_LITERAL_STRING(kSVGTextContentType))
#endif
) {
result=ePrimaryDetect;
}
else if (aParserContext.mMimeType.IsEmpty()) {
nsAReadableString::const_iterator iter, end;
aBuffer.BeginReading(iter);
aBuffer.EndReading(end);
if (FindInReadable(NS_LITERAL_STRING("<?xml "), iter, end)) {
aParserContext.SetMimeType(NS_ConvertASCIItoUCS2(kXMLTextContentType));
result=eValidDetect;
}
}
}
return result;
}
/**
* The parser uses a code sandwich to wrap the parsing process. Before
* the process begins, WillBuildModel() is called. Afterwards the parser
* calls DidBuildModel().
* @update rickg 03.20.2000
* @param aParserContext
* @param aSink
* @return error code (almost always 0)
*/
nsresult CWellFormedDTD::WillBuildModel( const CParserContext& aParserContext,nsIContentSink* aSink){
nsresult result=NS_OK;
mFilename=aParserContext.mScanner->GetFilename();
mSink=aSink;
if((!aParserContext.mPrevContext) && (mSink)) {
mLineNumber=1;
result = mSink->WillBuildModel();
#if 0
/* COMMENT OUT THIS BLOCK IF: you aren't using an nsHTMLContentSink...*/
{
//now let's automatically open the html...
CStartToken theHTMLToken(eHTMLTag_html);
nsCParserNode theHTMLNode(&theHTMLToken,0);
mSink->OpenHTML(theHTMLNode);
//now let's automatically open the body...
CStartToken theBodyToken(eHTMLTag_body);
nsCParserNode theBodyNode(&theBodyToken,0);
mSink->OpenBody(theBodyNode);
}
/* COMMENT OUT THIS BLOCK IF: you aren't using an nsHTMLContentSink...*/
#endif
}
return result;
}
/**
* The parser uses a code sandwich to wrap the parsing process. Before
* the process begins, WillBuildModel() is called. Afterwards the parser
* calls DidBuildModel().
* @update gess 1/4/99
* @param aFilename is the name of the file being parsed.
* @return error code (almost always 0)
*/
NS_IMETHODIMP CWellFormedDTD::BuildModel(nsIParser* aParser,nsITokenizer* aTokenizer,nsITokenObserver* anObserver,nsIContentSink* aSink) {
nsresult result=NS_OK;
if(aTokenizer) {
nsHTMLTokenizer* oldTokenizer=mTokenizer;
mTokenizer=(nsHTMLTokenizer*)aTokenizer;
while(NS_SUCCEEDED(result)){
if(mDTDState!=NS_ERROR_HTMLPARSER_STOPPARSING) {
CToken* theToken=mTokenizer->PopToken();
if(theToken) {
result=HandleToken(theToken,aParser);
if(NS_SUCCEEDED(result) || (NS_ERROR_HTMLPARSER_BLOCK==result)) {
IF_FREE(theToken, mTokenizer->GetTokenAllocator());
}
else {
// if(NS_ERROR_HTMLPARSER_BLOCK!=result){
mTokenizer->PushTokenFront(theToken);
}
}
else break;
}
else result=mDTDState;
}//while
mTokenizer=oldTokenizer;
}
else result=NS_ERROR_HTMLPARSER_BADTOKENIZER;
return result;
}
/**
*
* @update gess5/18/98
* @param
* @return
*/
NS_IMETHODIMP CWellFormedDTD::DidBuildModel(nsresult anErrorCode,PRBool aNotifySink,nsIParser* aParser,nsIContentSink* aSink){
nsresult result= NS_OK;
//ADD CODE HERE TO CLOSE OPEN CONTAINERS...
if(aParser){
mSink=aParser->GetContentSink();
if((aNotifySink) && (mSink)) {
result = mSink->DidBuildModel(1);
#if 0
/* COMMENT OUT THIS BLOCK IF: you aren't using an nsHTMLContentSink...*/
{
nsIHTMLContentSink* mSink=(nsIHTMLContentSink*)mSink;
//now let's automatically open the body...
CEndToken theBodyToken(eHTMLTag_body);
nsCParserNode theBodyNode(&theBodyToken,0);
mSink->CloseBody(theBodyNode);
//now let's automatically open the html...
CEndToken theHTMLToken(eHTMLTag_html);
nsCParserNode theHTMLNode(&theBodyToken,0);
mSink->CloseHTML(theBodyNode);
}
/* COMMENT OUT THIS BLOCK IF: you aren't using an nsHTMLContentSink...*/
#endif
}
}
return result;
}
/**
* Use this id you want to stop the building content model
* --------------[ Sets DTD to STOP mode ]----------------
* It's recommended to use this method in accordance with
* the parser's terminate() method. Here we process only
* the "error" token.
*
* @update harishd 07/22/99
* @param aParser - Parser that exists.
* @return NS_ERROR_HTMLPARSER_STOPPARSING or the appropriate error.
*/
nsresult CWellFormedDTD::Terminate(nsIParser* aParser)
{
nsresult result=NS_OK;
if(mTokenizer) {
nsTokenAllocator* theAllocator=mTokenizer->GetTokenAllocator();
if(theAllocator) {
eHTMLTokenTypes theType=eToken_unknown;
mDTDState=NS_ERROR_HTMLPARSER_STOPPARSING;
while(result==NS_OK){
CToken* theToken=mTokenizer->PopToken();
if(theToken) {
theType=(eHTMLTokenTypes)theToken->GetTokenType();
if(theType==eToken_error) {
result=HandleToken(theToken,aParser);
}
IF_FREE(theToken, mTokenizer->GetTokenAllocator());
}
else break;
}//while
}//if
}//if
result=(NS_SUCCEEDED(result))? mDTDState:result;
return result;
}
/**
* Retrieve the preferred tokenizer for use by this DTD.
* @update gess12/28/98
* @param none
* @return ptr to tokenizer
*/
nsresult CWellFormedDTD::GetTokenizer(nsITokenizer*& aTokenizer) {
nsresult result=NS_OK;
if(!mTokenizer) {
mTokenizer=(nsHTMLTokenizer*)new nsExpatTokenizer(&mFilename);
NS_IF_ADDREF(mTokenizer);
}
aTokenizer=mTokenizer;
return result;
}
/**
*
* @update gess5/18/98
* @param
* @return
*/
NS_IMETHODIMP CWellFormedDTD::WillResumeParse(nsIContentSink* aSink){
nsresult result = NS_OK;
if(aSink) {
result = aSink->WillResume();
}
return result;
}
/**
*
* @update gess5/18/98
* @param
* @return
*/
NS_IMETHODIMP CWellFormedDTD::WillInterruptParse(nsIContentSink* aSink){
nsresult result = NS_OK;
if(aSink) {
result = aSink->WillInterrupt();
}
return result;
}
PRBool
CWellFormedDTD::IsBlockElement(PRInt32 aTagID,PRInt32 aParentID) const
{
return PR_FALSE;
}
PRBool
CWellFormedDTD::IsInlineElement(PRInt32 aTagID,PRInt32 aParentID) const
{
return PR_FALSE;
}
/**
* Called by the parser to enable/disable dtd verification of the
* internal context stack.
* @update gess 7/23/98
* @param
* @return
*/
void CWellFormedDTD::SetVerification(PRBool aEnabled){
}
/**
* This method is called to determine whether or not a tag
* of one type can contain a tag of another type.
*
* @update gess 3/25/98
* @param aParent -- int tag of parent container
* @param aChild -- int tag of child container
* @return PR_TRUE if parent can contain child
*/
PRBool CWellFormedDTD::CanContain(PRInt32 aParent,PRInt32 aChild) const{
PRBool result=PR_TRUE;
return result;
}
/**
* Give rest of world access to our tag enums, so that CanContain(), etc,
* become useful.
*/
NS_IMETHODIMP
CWellFormedDTD::StringTagToIntTag(const nsAReadableString &aTag,
PRInt32* aIntTag) const
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP_(const PRUnichar *)
CWellFormedDTD::IntTagToStringTag(PRInt32 aIntTag) const
{
return nsnull;
}
NS_IMETHODIMP
CWellFormedDTD::ConvertEntityToUnicode(const nsAReadableString& aEntity,
PRInt32* aUnicode) const
{
return NS_ERROR_NOT_IMPLEMENTED;
}
/**
* This method gets called to determine whether a given
* tag is itself a container
*
* @update gess 3/25/98
* @param aTag -- tag to test for containership
* @return PR_TRUE if given tag can contain other tags
*/
PRBool CWellFormedDTD::IsContainer(PRInt32 aTag) const{
PRBool result=PR_TRUE;
return result;
}
/**
*
* @update vidur 11/12/98
* @param aToken -- token object to be put into content model
* @return 0 if all is well; non-zero is an error
*/
NS_IMETHODIMP CWellFormedDTD::HandleToken(CToken* aToken,nsIParser* aParser) {
nsresult result=NS_OK;
CHTMLToken* theToken= (CHTMLToken*)(aToken);
eHTMLTokenTypes theType= (eHTMLTokenTypes)theToken->GetTokenType();
mParser=(nsParser*)aParser;
mSink=aParser->GetContentSink();
switch(theType) {
case eToken_newline:
mLineNumber++; //now fall through
case eToken_entity:
case eToken_whitespace:
case eToken_text:
case eToken_cdatasection:
case eToken_markupDecl:
result=HandleLeafToken(aToken);
break;
case eToken_comment:
result=HandleCommentToken(aToken);
break;
case eToken_instruction:
result=HandleProcessingInstructionToken(aToken);
break;
case eToken_start:
result=HandleStartToken(aToken);
break;
case eToken_end:
result=HandleEndToken(aToken);
break;
case eToken_error:
result=HandleErrorToken(aToken);
break;
case eToken_doctypeDecl:
result=HandleDocTypeDeclToken(aToken);
break;
case eToken_style:
case eToken_skippedcontent:
default:
result=NS_OK;
}//switch
return result;
}
/**
* This method gets called when a leaf token has been
* encountered in the parse process.
*
* @update harishd 08/18/99
*
* @param aToken -- next token to be handled
* @return NS_OK if all went well; NS_ERROR_XXX if error occured
*/
nsresult CWellFormedDTD::HandleLeafToken(CToken* aToken) {
NS_PRECONDITION(0!=aToken,"null token");
nsresult result=NS_OK;
nsCParserNode theNode((CHTMLToken*)aToken,mLineNumber,mTokenizer->GetTokenAllocator());
result= (mSink)? mSink->AddLeaf(theNode):NS_OK;
return result;
}
/**
* This method gets called when a comment token has been
* encountered in the parse process. Here we also make sure
* to count the newlines in the comment.
*
* @update harishd 08/18/99
*
* @param aToken -- next token to be handled
* @return NS_OK if all went well; NS_ERROR_XXX if error occured
*/
nsresult CWellFormedDTD::HandleCommentToken(CToken* aToken) {
NS_PRECONDITION(0!=aToken,"null token");
nsresult result=NS_OK;
CCommentToken* theToken = (CCommentToken*)aToken;
mLineNumber += CountCharInReadable(theToken->GetStringValue(),
PRUnichar(kNewLine));
nsCParserNode theNode((CHTMLToken*)aToken,mLineNumber,mTokenizer->GetTokenAllocator());
result=(mSink)? mSink->AddComment(theNode):NS_OK;
return result;
}
/**
* This method gets called when a prcessing instruction
* has been encountered in the parse process.
*
* @update harishd 08/18/99
*
* @param aToken -- next token to be handled
* @return NS_OK if all went well; NS_ERROR_XXX if error occured
*/
nsresult CWellFormedDTD::HandleProcessingInstructionToken(CToken* aToken) {
NS_PRECONDITION(0!=aToken,"null token");
nsresult result=NS_OK;
nsCParserNode theNode((CHTMLToken*)aToken,mLineNumber,mTokenizer->GetTokenAllocator());
result=(mSink)? mSink->AddProcessingInstruction(theNode):NS_OK;
return result;
}
/**
* This method gets called when a start token has been
* encountered in the parse process.
*
* @update harishd 08/18/99
*
* @param aToken -- next (start) token to be handled
* @return NS_OK if all went well; NS_ERROR_XXX if error occured
*/
nsresult CWellFormedDTD::HandleStartToken(CToken* aToken) {
NS_PRECONDITION(0!=aToken,"null token");
nsresult result=NS_OK;
nsCParserNode theNode((CHTMLToken*)aToken,mLineNumber,mTokenizer->GetTokenAllocator());
PRInt16 attrCount=aToken->GetAttributeCount();
if(0<attrCount){ //go collect the attributes...
int attr=0;
for(attr=0;attr<attrCount;attr++){
CToken* theInnerToken= (mTokenizer)? mTokenizer->PeekToken():nsnull;
if(theInnerToken) {
eHTMLTokenTypes theInnerType=eHTMLTokenTypes(theInnerToken->GetTokenType());
if(eToken_attribute==theInnerType){
mTokenizer->PopToken(); //pop it for real...
theNode.AddAttribute(theInnerToken);
}
}
else return kEOF;
}
}
// Pass the ID Attribute atom from the start token to the parser node
CStartToken* startToken = NS_STATIC_CAST(CStartToken *, aToken);
nsCOMPtr<nsIAtom> IDAttr=nsnull;
result = startToken->GetIDAttributeAtom(getter_AddRefs(IDAttr));
if (IDAttr && NS_SUCCEEDED(result))
result = theNode.SetIDAttributeAtom(IDAttr);
if(NS_OK==result){
if(mSink) {
result=mSink->OpenContainer(theNode);
if(((CStartToken*)aToken)->IsEmpty()){
result=mSink->CloseContainer(theNode);
}
}
}
return result;
}
/**
* This method gets called when an end token has been
* encountered in the parse process.
*
* @update harishd 08/18/99
*
* @param aToken -- next (end) token to be handled
* @return NS_OK if all went well; NS_ERROR_XXX if error occured
*/
nsresult CWellFormedDTD::HandleEndToken(CToken* aToken) {
NS_PRECONDITION(0!=aToken,"null token");
nsresult result=NS_OK;
nsCParserNode theNode((CHTMLToken*)aToken,mLineNumber,mTokenizer->GetTokenAllocator());
result=(mSink)? mSink->CloseContainer(theNode):NS_OK;
return result;
}
/**
* This method gets called when an error token has been
* encountered in the parse process.
* FYI: when the document is malformed this is the only
* token that will get reported to the content sink.
*
* @update harishd 08/18/99
*
* @param aToken -- next token to be handled
* @return NS_OK if all went well; NS_ERROR_XXX if error occured
*/
nsresult CWellFormedDTD::HandleErrorToken(CToken* aToken) {
NS_PRECONDITION(0!=aToken,"null token");
nsresult result=NS_OK;
if(mTokenizer) {
// Cycle through the remaining tokens in the token stream and handle them
// These tokens were added so that content objects for the error message
// are generated by the content sink
while (PR_TRUE) {
CToken* token = mTokenizer->PopToken();
if(token) {
eHTMLTokenTypes type = (eHTMLTokenTypes) token->GetTokenType();
switch(type) {
case eToken_newline:
mLineNumber++; //now fall through
case eToken_whitespace:
case eToken_text:
HandleLeafToken(token);
break;
case eToken_start:
HandleStartToken(token);
break;
case eToken_end:
HandleEndToken(token);
break;
default:
// Do nothing
break;
}
IF_FREE(token, mTokenizer->GetTokenAllocator());
}
else
break;
}
}
// Propagate the error onto the content sink.
CErrorToken *errTok = (CErrorToken *)aToken;
const nsParserError* error = errTok->GetError();
result=(mSink)? mSink->NotifyError(error):NS_OK;
// Output the error to the console
if (error) {
nsCAutoString temp;
temp.AssignWithConversion(mFilename);
PR_fprintf(PR_STDOUT, "XML Error in file '%s', ", temp.get());
PR_fprintf(PR_STDOUT, "Line Number: %d, ", error->lineNumber);
PR_fprintf(PR_STDOUT, "Col Number: %d, ", error->colNumber);
temp.AssignWithConversion(error->description);
PR_fprintf(PR_STDOUT, "Description: %s\n", temp.get());
temp.AssignWithConversion(error->sourceLine);
PR_fprintf(PR_STDOUT, "Source Line: %s\n", temp.get());
}
return result;
}
/**
* This method gets called when a doc. type token has been
* encountered in the parse process.
*
* @update harishd 08/18/99
*
* @param aToken -- next token to be handled
* @return NS_OK if all went well; NS_ERROR_XXX if error occured
*/
nsresult CWellFormedDTD::HandleDocTypeDeclToken(CToken* aToken) {
NS_PRECONDITION(0!=aToken,"null token");
nsresult result=NS_OK;
nsCParserNode theNode((CHTMLToken*)aToken,mLineNumber,mTokenizer->GetTokenAllocator());
result = (mSink)? mSink->AddDocTypeDecl(theNode, 0):NS_OK;
return result;
}

97
htmlparser/src/nsWellFormedDTD.h
Просмотреть файл

@ -1,97 +0,0 @@
/* -*- Mode: C++; tab-width: 4; 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 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 gess 4/8/98
*
*
*/
#ifndef __NS_WELLFORMED_DTD
#define __NS_WELLFORMED_DTD
#include "nsIDTD.h"
#include "nsISupports.h"
#include "nsHTMLTokens.h"
#include "nsIContentSink.h"
#define NS_WELLFORMED_DTD_IID \
{0xa39c6bfd, 0x15f0, 0x11d2, \
{0x80, 0x41, 0x0, 0x10, 0x4b, 0x98, 0x3f, 0xd4}}
class nsIDTDDebug;
class nsIParserNode;
class nsParser;
class nsHTMLTokenizer;
class CWellFormedDTD : public nsIDTD
{
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIDTD
/**
*
*
* @update gess 4/9/98
* @param
* @return
*/
CWellFormedDTD();
/**
*
*
* @update gess 4/9/98
* @param
* @return
*/
virtual ~CWellFormedDTD();
virtual void SetVerification(PRBool aEnable);
protected:
nsresult HandleStartToken(CToken* aToken);
nsresult HandleEndToken(CToken* aToken);
nsresult HandleCommentToken(CToken* aToken);
nsresult HandleErrorToken(CToken* aToken);
nsresult HandleDocTypeDeclToken(CToken* aToken);
nsresult HandleLeafToken(CToken* aToken);
nsresult HandleProcessingInstructionToken(CToken* aToken);
nsParser* mParser;
nsIContentSink* mSink;
nsString mFilename;
PRInt32 mLineNumber;
nsHTMLTokenizer* mTokenizer;
nsresult mDTDState;
};
extern nsresult NS_NewWellFormed_DTD(nsIDTD** aInstancePtrResult);
#endif

6
layout/html/document/src/ua.css
Просмотреть файл

@ -38,7 +38,9 @@
@import url(chrome://global/content/xul.css);
@import url(resource:/res/quirk.css);
parsererror {
@namespace parsererror url(http://www.mozilla.org/newlayout/xml/parsererror.xml);
parsererror|parsererror {
display: block;
font-family: sans-serif;
font-weight: bold;
@ -52,7 +54,7 @@ parsererror {
background-color: lightyellow;
}
sourcetext {
parsererror|sourcetext {
display: block;
white-space: pre;
font-family: Courier;

6
layout/style/ua.css
Просмотреть файл

@ -38,7 +38,9 @@
@import url(chrome://global/content/xul.css);
@import url(resource:/res/quirk.css);
parsererror {
@namespace parsererror url(http://www.mozilla.org/newlayout/xml/parsererror.xml);
parsererror|parsererror {
display: block;
font-family: sans-serif;
font-weight: bold;
@ -52,7 +54,7 @@ parsererror {
background-color: lightyellow;
}
sourcetext {
parsererror|sourcetext {
display: block;
white-space: pre;
font-family: Courier;

1
parser/htmlparser/public/MANIFEST
Просмотреть файл

@ -10,7 +10,6 @@ nsIParserNode.h
nsIParserFilter.h
nsIParser.h
nsIDTD.h
nsIExpatTokenizer.h
nsIElementObserver.h
nsIParserService.h
nsHTMLTags.h

77
parser/htmlparser/public/nsIExpatTokenizer.h
Просмотреть файл

@ -1,77 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
* 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 the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the NPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/**
* MODULE NOTES:
* @update nra 2/24/99
*
*/
#ifndef __NSIEXPATTOKENIZER__
#define __NSIEXPATTOKENIZER__
#include "nsISupports.h"
#include "prtypes.h"
#include "xmlparse.h"
class CToken;
class nsScanner;
#define NS_IEXPATTOKENIZER_IID \
{0xf86a4380, 0xce17, 0x11d2, {0x80, 0x3f, 0x00, 0x60, 0x08, 0x98, 0x28, 0x77}}
class nsIExpatTokenizer : public nsITokenizer {
public:
/* Methods for setting callbacks on the expat parser */
virtual void SetElementHandler(XML_StartElementHandler start, XML_EndElementHandler end)=0;
virtual void SetCharacterDataHandler(XML_CharacterDataHandler handler)=0;
virtual void SetProcessingInstructionHandler(XML_ProcessingInstructionHandler handler)=0;
virtual void SetDefaultHandler(XML_DefaultHandler handler)=0;
virtual void SetUnparsedEntityDeclHandler(XML_UnparsedEntityDeclHandler handler)=0;
virtual void SetNotationDeclHandler(XML_NotationDeclHandler handler)=0;
virtual void SetExternalEntityRefHandler(XML_ExternalEntityRefHandler handler)=0;
virtual void SetUnknownEncodingHandler(XML_UnknownEncodingHandler handler, void *encodingHandlerData)=0;
virtual void FrontloadMisplacedContent(nsDeque& aDeque)=0;
};
#endif

1016
parser/htmlparser/src/nsExpatTokenizer.cpp
Просмотреть файл

Разница между файлами не показана из-за своего большого размера Загрузить разницу

208
parser/htmlparser/src/nsExpatTokenizer.h
Просмотреть файл

@ -1,208 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
* 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 the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the NPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/**
* MODULE NOTES:
* @update gess 4/1/98
*
*/
#ifndef __nsExpatTokenizer
#define __nsExpatTokenizer
#include "nsISupports.h"
#include "nsHTMLTokenizer.h"
#include "prtypes.h"
// Enable unicode characters in expat.
#define UNICODE
#include "xmlparse.h"
#define NS_EXPATTOKENIZER_IID \
{0x483836aa, 0xcabe, 0x11d2, { 0xab, 0xcb, 0x0, 0x10, 0x4b, 0x98, 0x3f, 0xd4 }}
// {575C063A-AE9C-11d3-B9FD-001083023C0E}
#define NS_EXPATTOKENIZER_CID \
{ 0x575c063a, 0xae9c, 0x11d3, \
{0xb9, 0xfd, 0x0, 0x10, 0x83, 0x2, 0x3c, 0xe}}
typedef struct _XMLParserState XMLParserState;
/***************************************************************
Notes:
***************************************************************/
#if defined(XP_PC)
#pragma warning( disable : 4275 )
#endif
#ifdef __cplusplus
extern "C" {
#endif
/* The callback handlers that get called from the expat parser */
void Tokenizer_HandleStartElement(void *userData, const XML_Char *name, const XML_Char **atts);
void Tokenizer_HandleEndElement(void *userData, const XML_Char *name);
void Tokenizer_HandleCharacterData(void *userData, const XML_Char *s, int len);
void Tokenizer_HandleComment(void *userData, const XML_Char *name);
void Tokenizer_HandleProcessingInstruction(void *userData,
const XML_Char *target,
const XML_Char *data);
void Tokenizer_HandleDefault(void *userData, const XML_Char *s, int len);
void Tokenizer_HandleStartCdataSection(void *userData);
void Tokenizer_HandleEndCdataSection(void *userData);
void Tokenizer_HandleUnparsedEntityDecl(void *userData,
const XML_Char *entityName,
const XML_Char *base,
const XML_Char *systemId,
const XML_Char *publicId,
const XML_Char *notationName);
void Tokenizer_HandleNotationDecl(void *userData,
const XML_Char *notationName,
const XML_Char *base,
const XML_Char *systemId,
const XML_Char *publicId);
int Tokenizer_HandleExternalEntityRef(XML_Parser parser,
const XML_Char *openEntityNames,
const XML_Char *base,
const XML_Char *systemId,
const XML_Char *publicId);
int Tokenizer_HandleUnknownEncoding(void *encodingHandlerData,
const XML_Char *name,
XML_Encoding *info);
void Tokenizer_HandleStartDoctypeDecl(void *userData,
const XML_Char *doctypeName);
void Tokenizer_HandleEndDoctypeDecl(void *userData);
#ifdef __cplusplus
}
#endif
class nsExpatTokenizer : public nsHTMLTokenizer {
public:
nsExpatTokenizer(nsString* aURL = nsnull);
virtual ~nsExpatTokenizer();
virtual const nsIID& GetCID();
static const nsIID& GetIID();
NS_DECL_ISUPPORTS
/* nsITokenizer methods */
virtual nsresult WillTokenize(PRBool aIsFinalChunk,nsTokenAllocator* aTokenAllocator);
virtual nsresult ConsumeToken(nsScanner& aScanner,PRBool& aFlushTokens);
virtual nsresult DidTokenize(PRBool aIsFinalChunk);
virtual void FrontloadMisplacedContent(nsDeque& aDeque);
protected:
/**
* Parse an XML buffer using expat
* @update nra 2/29/99
* @return NS_ERROR_FAILURE if expat encounters an error, else NS_OK
*/
nsresult ParseXMLBuffer(const char *aBuffer, PRUint32 aLength, PRBool aIsFinal=PR_FALSE);
/**
* Sets up the callbacks and user data for the expat parser
* @update nra 2/24/99
* @param none
* @return none
*/
void SetupExpatParser(void);
// Propagate XML errors to the content sink
nsresult PushXMLErrorTokens(const char *aBuffer, PRUint32 aLength, PRBool aIsFinal);
nsresult AddErrorMessageTokens(nsParserError* aError);
void GetLine(const char* aSourceBuffer, PRUint32 aLength,
PRUint32 aByteIndex, nsString& aLine);
// Load up an external stream to get external entity information
static nsresult OpenInputStream(const XML_Char* aURLStr,
const XML_Char* aBaseURL,
nsIInputStream** in,
nsString* aAbsURL);
static nsresult LoadStream(nsIInputStream* in,
PRUnichar* &uniBuf,
PRUint32 &retLen);
/* The callback handlers that get called from the expat parser */
friend void Tokenizer_HandleStartElement(void *userData, const XML_Char *name, const XML_Char **atts);
friend void Tokenizer_HandleEndElement(void *userData, const XML_Char *name);
friend void Tokenizer_HandleCharacterData(void *userData, const XML_Char *s, int len);
friend void Tokenizer_HandleComment(void *userData, const XML_Char *name);
friend void Tokenizer_HandleProcessingInstruction(void *userData,
const XML_Char *target,
const XML_Char *data);
friend void Tokenizer_HandleDefault(void *userData, const XML_Char *s, int len);
friend void Tokenizer_HandleStartCdataSection(void *userData);
friend void Tokenizer_HandleEndCdataSection(void *userData);
friend void Tokenizer_HandleUnparsedEntityDecl(void *userData,
const XML_Char *entityName,
const XML_Char *base,
const XML_Char *systemId,
const XML_Char *publicId,
const XML_Char *notationName);
friend void Tokenizer_HandleNotationDecl(void *userData,
const XML_Char *notationName,
const XML_Char *base,
const XML_Char *systemId,
const XML_Char *publicId);
friend int Tokenizer_HandleExternalEntityRef(XML_Parser parser,
const XML_Char *openEntityNames,
const XML_Char *base,
const XML_Char *systemId,
const XML_Char *publicId);
friend int Tokenizer_HandleUnknownEncoding(void *encodingHandlerData,
const XML_Char *name,
XML_Encoding *info);
friend void Tokenizer_HandleStartDoctypeDecl(void *userData,
const XML_Char *doctypeName);
friend void Tokenizer_HandleEndDoctypeDecl(void *userData);
XML_Parser mExpatParser;
PRUint32 mBytesParsed;
nsString mLastLine;
XMLParserState* mState;
};
#endif

784
parser/htmlparser/src/nsWellFormedDTD.cpp
Просмотреть файл

@ -1,784 +0,0 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
/* ***** BEGIN LICENSE BLOCK *****
* Version: NPL 1.1/GPL 2.0/LGPL 2.1
*
* 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 the Initial Developer are Copyright (C) 1998
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
*
*
* Alternatively, the contents of this file may be used under the terms of
* either the GNU General Public License Version 2 or later (the "GPL"), or
* the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
* in which case the provisions of the GPL or the LGPL are applicable instead
* of those above. If you wish to allow use of your version of this file only
* under the terms of either the GPL or the LGPL, and not to allow others to
* use your version of this file under the terms of the NPL, indicate your
* decision by deleting the provisions above and replace them with the notice
* and other provisions required by the GPL or the LGPL. If you do not delete
* the provisions above, a recipient may use your version of this file under
* the terms of any one of the NPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/**
* MODULE NOTES:
* @update gess 4/8/98
*
*
*/
#include "nsWellFormedDTD.h"
#include "nsCRT.h"
#include "nsParser.h"
#include "nsScanner.h"
#include "nsIParser.h"
#include "nsDTDUtils.h"
#include "nsIContentSink.h"
#include "nsIHTMLContentSink.h"
#include "nsHTMLTokenizer.h"
#include "nsExpatTokenizer.h"
#include "prenv.h" //this is here for debug reasons...
#include "prtypes.h" //this is here for debug reasons...
#include "prio.h"
#include "plstr.h"
#include "prprf.h"
#include "prmem.h"
#include "nsSpecialSystemDirectory.h"
#include <ctype.h> // toupper()
#include "nsString.h"
#include "nsReadableUtils.h"
static NS_DEFINE_IID(kISupportsIID, NS_ISUPPORTS_IID);
static NS_DEFINE_IID(kIDTDIID, NS_IDTD_IID);
static NS_DEFINE_IID(kClassIID, NS_WELLFORMED_DTD_IID);
/**
* This method gets called as part of our COM-like interfaces.
* Its purpose is to create an interface to parser object
* of some type.
*
* @update gess 4/8/98
* @param nsIID id of object to discover
* @param aInstancePtr ptr to newly discovered interface
* @return NS_xxx result code
*/
nsresult CWellFormedDTD::QueryInterface(const nsIID& aIID, void** aInstancePtr)
{
if (NULL == aInstancePtr) {
return NS_ERROR_NULL_POINTER;
}
if(aIID.Equals(kISupportsIID)) { //do IUnknown...
*aInstancePtr = (nsIDTD*)(this);
}
else if(aIID.Equals(kIDTDIID)) { //do IParser base class...
*aInstancePtr = (nsIDTD*)(this);
}
else if(aIID.Equals(kClassIID)) { //do this class...
*aInstancePtr = (CWellFormedDTD*)(this);
}
else {
*aInstancePtr=0;
return NS_NOINTERFACE;
}
NS_ADDREF_THIS();
return NS_OK;
}
/**
* This method is defined in nsIParser. It is used to
* cause the COM-like construction of an nsParser.
*
* @update gess 4/8/98
* @param nsIParser** ptr to newly instantiated parser
* @return NS_xxx error result
*/
nsresult NS_NewWellFormed_DTD(nsIDTD** aInstancePtrResult)
{
CWellFormedDTD* it = new CWellFormedDTD();
if (it == 0) {
return NS_ERROR_OUT_OF_MEMORY;
}
return it->QueryInterface(kClassIID, (void **) aInstancePtrResult);
}
NS_IMPL_ADDREF(CWellFormedDTD)
NS_IMPL_RELEASE(CWellFormedDTD)
/**
* Default constructor
*
* @update gess 4/9/98
* @param
* @return
*/
CWellFormedDTD::CWellFormedDTD() : nsIDTD() {
NS_INIT_REFCNT();
mParser=0;
mSink=0;
mLineNumber=1;
mTokenizer=0;
mDTDState=NS_OK;
}
/**
* Default destructor
*
* @update gess 4/9/98
* @param
* @return
*/
CWellFormedDTD::~CWellFormedDTD(){
mParser=0; //just to prove we destructed...
NS_IF_RELEASE(mTokenizer);
}
/**
*
* @update gess1/8/99
* @param
* @return
*/
const nsIID& CWellFormedDTD::GetMostDerivedIID(void) const{
return kClassIID;
}
/**
* Call this method if you want the DTD to construct a fresh
* instance of itself.
* @update gess7/23/98
* @param
* @return
*/
nsresult CWellFormedDTD::CreateNewInstance(nsIDTD** aInstancePtrResult){
return NS_NewWellFormed_DTD(aInstancePtrResult);
}
/**
* This method is called to determine if the given DTD can parse
* a document in a given source-type.
* NOTE: Parsing always assumes that the end result will involve
* storing the result in the main content model.
* @update gess6/24/98
* @param
* @return TRUE if this DTD can satisfy the request; FALSE otherwise.
*/
NS_IMETHODIMP_(eAutoDetectResult)
CWellFormedDTD::CanParse(CParserContext& aParserContext,
const nsString& aBuffer, PRInt32 aVersion)
{
eAutoDetectResult result=eUnknownDetect;
if(eViewSource!=aParserContext.mParserCommand) {
if(aParserContext.mMimeType.EqualsWithConversion(kXMLTextContentType) ||
aParserContext.mMimeType.EqualsWithConversion(kXMLApplicationContentType) ||
aParserContext.mMimeType.EqualsWithConversion(kXHTMLApplicationContentType) ||
aParserContext.mMimeType.EqualsWithConversion(kRDFTextContentType) ||
aParserContext.mMimeType.EqualsWithConversion(kXULTextContentType)
#ifdef MOZ_SVG
|| aParserContext.mMimeType.Equals(NS_LITERAL_STRING(kSVGTextContentType))
#endif
) {
result=ePrimaryDetect;
}
else if (aParserContext.mMimeType.IsEmpty()) {
nsAReadableString::const_iterator iter, end;
aBuffer.BeginReading(iter);
aBuffer.EndReading(end);
if (FindInReadable(NS_LITERAL_STRING("<?xml "), iter, end)) {
aParserContext.SetMimeType(NS_ConvertASCIItoUCS2(kXMLTextContentType));
result=eValidDetect;
}
}
}
return result;
}
/**
* The parser uses a code sandwich to wrap the parsing process. Before
* the process begins, WillBuildModel() is called. Afterwards the parser
* calls DidBuildModel().
* @update rickg 03.20.2000
* @param aParserContext
* @param aSink
* @return error code (almost always 0)
*/
nsresult CWellFormedDTD::WillBuildModel( const CParserContext& aParserContext,nsIContentSink* aSink){
nsresult result=NS_OK;
mFilename=aParserContext.mScanner->GetFilename();
mSink=aSink;
if((!aParserContext.mPrevContext) && (mSink)) {
mLineNumber=1;
result = mSink->WillBuildModel();
#if 0
/* COMMENT OUT THIS BLOCK IF: you aren't using an nsHTMLContentSink...*/
{
//now let's automatically open the html...
CStartToken theHTMLToken(eHTMLTag_html);
nsCParserNode theHTMLNode(&theHTMLToken,0);
mSink->OpenHTML(theHTMLNode);
//now let's automatically open the body...
CStartToken theBodyToken(eHTMLTag_body);
nsCParserNode theBodyNode(&theBodyToken,0);
mSink->OpenBody(theBodyNode);
}
/* COMMENT OUT THIS BLOCK IF: you aren't using an nsHTMLContentSink...*/
#endif
}
return result;
}
/**
* The parser uses a code sandwich to wrap the parsing process. Before
* the process begins, WillBuildModel() is called. Afterwards the parser
* calls DidBuildModel().
* @update gess 1/4/99
* @param aFilename is the name of the file being parsed.
* @return error code (almost always 0)
*/
NS_IMETHODIMP CWellFormedDTD::BuildModel(nsIParser* aParser,nsITokenizer* aTokenizer,nsITokenObserver* anObserver,nsIContentSink* aSink) {
nsresult result=NS_OK;
if(aTokenizer) {
nsHTMLTokenizer* oldTokenizer=mTokenizer;
mTokenizer=(nsHTMLTokenizer*)aTokenizer;
while(NS_SUCCEEDED(result)){
if(mDTDState!=NS_ERROR_HTMLPARSER_STOPPARSING) {
CToken* theToken=mTokenizer->PopToken();
if(theToken) {
result=HandleToken(theToken,aParser);
if(NS_SUCCEEDED(result) || (NS_ERROR_HTMLPARSER_BLOCK==result)) {
IF_FREE(theToken, mTokenizer->GetTokenAllocator());
}
else {
// if(NS_ERROR_HTMLPARSER_BLOCK!=result){
mTokenizer->PushTokenFront(theToken);
}
}
else break;
}
else result=mDTDState;
}//while
mTokenizer=oldTokenizer;
}
else result=NS_ERROR_HTMLPARSER_BADTOKENIZER;
return result;
}
/**
*
* @update gess5/18/98
* @param
* @return
*/
NS_IMETHODIMP CWellFormedDTD::DidBuildModel(nsresult anErrorCode,PRBool aNotifySink,nsIParser* aParser,nsIContentSink* aSink){
nsresult result= NS_OK;
//ADD CODE HERE TO CLOSE OPEN CONTAINERS...
if(aParser){
mSink=aParser->GetContentSink();
if((aNotifySink) && (mSink)) {
result = mSink->DidBuildModel(1);
#if 0
/* COMMENT OUT THIS BLOCK IF: you aren't using an nsHTMLContentSink...*/
{
nsIHTMLContentSink* mSink=(nsIHTMLContentSink*)mSink;
//now let's automatically open the body...
CEndToken theBodyToken(eHTMLTag_body);
nsCParserNode theBodyNode(&theBodyToken,0);
mSink->CloseBody(theBodyNode);
//now let's automatically open the html...
CEndToken theHTMLToken(eHTMLTag_html);
nsCParserNode theHTMLNode(&theBodyToken,0);
mSink->CloseHTML(theBodyNode);
}
/* COMMENT OUT THIS BLOCK IF: you aren't using an nsHTMLContentSink...*/
#endif
}
}
return result;
}
/**
* Use this id you want to stop the building content model
* --------------[ Sets DTD to STOP mode ]----------------
* It's recommended to use this method in accordance with
* the parser's terminate() method. Here we process only
* the "error" token.
*
* @update harishd 07/22/99
* @param aParser - Parser that exists.
* @return NS_ERROR_HTMLPARSER_STOPPARSING or the appropriate error.
*/
nsresult CWellFormedDTD::Terminate(nsIParser* aParser)
{
nsresult result=NS_OK;
if(mTokenizer) {
nsTokenAllocator* theAllocator=mTokenizer->GetTokenAllocator();
if(theAllocator) {
eHTMLTokenTypes theType=eToken_unknown;
mDTDState=NS_ERROR_HTMLPARSER_STOPPARSING;
while(result==NS_OK){
CToken* theToken=mTokenizer->PopToken();
if(theToken) {
theType=(eHTMLTokenTypes)theToken->GetTokenType();
if(theType==eToken_error) {
result=HandleToken(theToken,aParser);
}
IF_FREE(theToken, mTokenizer->GetTokenAllocator());
}
else break;
}//while
}//if
}//if
result=(NS_SUCCEEDED(result))? mDTDState:result;
return result;
}
/**
* Retrieve the preferred tokenizer for use by this DTD.
* @update gess12/28/98
* @param none
* @return ptr to tokenizer
*/
nsresult CWellFormedDTD::GetTokenizer(nsITokenizer*& aTokenizer) {
nsresult result=NS_OK;
if(!mTokenizer) {
mTokenizer=(nsHTMLTokenizer*)new nsExpatTokenizer(&mFilename);
NS_IF_ADDREF(mTokenizer);
}
aTokenizer=mTokenizer;
return result;
}
/**
*
* @update gess5/18/98
* @param
* @return
*/
NS_IMETHODIMP CWellFormedDTD::WillResumeParse(nsIContentSink* aSink){
nsresult result = NS_OK;
if(aSink) {
result = aSink->WillResume();
}
return result;
}
/**
*
* @update gess5/18/98
* @param
* @return
*/
NS_IMETHODIMP CWellFormedDTD::WillInterruptParse(nsIContentSink* aSink){
nsresult result = NS_OK;
if(aSink) {
result = aSink->WillInterrupt();
}
return result;
}
PRBool
CWellFormedDTD::IsBlockElement(PRInt32 aTagID,PRInt32 aParentID) const
{
return PR_FALSE;
}
PRBool
CWellFormedDTD::IsInlineElement(PRInt32 aTagID,PRInt32 aParentID) const
{
return PR_FALSE;
}
/**
* Called by the parser to enable/disable dtd verification of the
* internal context stack.
* @update gess 7/23/98
* @param
* @return
*/
void CWellFormedDTD::SetVerification(PRBool aEnabled){
}
/**
* This method is called to determine whether or not a tag
* of one type can contain a tag of another type.
*
* @update gess 3/25/98
* @param aParent -- int tag of parent container
* @param aChild -- int tag of child container
* @return PR_TRUE if parent can contain child
*/
PRBool CWellFormedDTD::CanContain(PRInt32 aParent,PRInt32 aChild) const{
PRBool result=PR_TRUE;
return result;
}
/**
* Give rest of world access to our tag enums, so that CanContain(), etc,
* become useful.
*/
NS_IMETHODIMP
CWellFormedDTD::StringTagToIntTag(const nsAReadableString &aTag,
PRInt32* aIntTag) const
{
return NS_ERROR_NOT_IMPLEMENTED;
}
NS_IMETHODIMP_(const PRUnichar *)
CWellFormedDTD::IntTagToStringTag(PRInt32 aIntTag) const
{
return nsnull;
}
NS_IMETHODIMP
CWellFormedDTD::ConvertEntityToUnicode(const nsAReadableString& aEntity,
PRInt32* aUnicode) const
{
return NS_ERROR_NOT_IMPLEMENTED;
}
/**
* This method gets called to determine whether a given
* tag is itself a container
*
* @update gess 3/25/98
* @param aTag -- tag to test for containership
* @return PR_TRUE if given tag can contain other tags
*/
PRBool CWellFormedDTD::IsContainer(PRInt32 aTag) const{
PRBool result=PR_TRUE;
return result;
}
/**
*
* @update vidur 11/12/98
* @param aToken -- token object to be put into content model
* @return 0 if all is well; non-zero is an error
*/
NS_IMETHODIMP CWellFormedDTD::HandleToken(CToken* aToken,nsIParser* aParser) {
nsresult result=NS_OK;
CHTMLToken* theToken= (CHTMLToken*)(aToken);
eHTMLTokenTypes theType= (eHTMLTokenTypes)theToken->GetTokenType();
mParser=(nsParser*)aParser;
mSink=aParser->GetContentSink();
switch(theType) {
case eToken_newline:
mLineNumber++; //now fall through
case eToken_entity:
case eToken_whitespace:
case eToken_text:
case eToken_cdatasection:
case eToken_markupDecl:
result=HandleLeafToken(aToken);
break;
case eToken_comment:
result=HandleCommentToken(aToken);
break;
case eToken_instruction:
result=HandleProcessingInstructionToken(aToken);
break;
case eToken_start:
result=HandleStartToken(aToken);
break;
case eToken_end:
result=HandleEndToken(aToken);
break;
case eToken_error:
result=HandleErrorToken(aToken);
break;
case eToken_doctypeDecl:
result=HandleDocTypeDeclToken(aToken);
break;
case eToken_style:
case eToken_skippedcontent:
default:
result=NS_OK;
}//switch
return result;
}
/**
* This method gets called when a leaf token has been
* encountered in the parse process.
*
* @update harishd 08/18/99
*
* @param aToken -- next token to be handled
* @return NS_OK if all went well; NS_ERROR_XXX if error occured
*/
nsresult CWellFormedDTD::HandleLeafToken(CToken* aToken) {
NS_PRECONDITION(0!=aToken,"null token");
nsresult result=NS_OK;
nsCParserNode theNode((CHTMLToken*)aToken,mLineNumber,mTokenizer->GetTokenAllocator());
result= (mSink)? mSink->AddLeaf(theNode):NS_OK;
return result;
}
/**
* This method gets called when a comment token has been
* encountered in the parse process. Here we also make sure
* to count the newlines in the comment.
*
* @update harishd 08/18/99
*
* @param aToken -- next token to be handled
* @return NS_OK if all went well; NS_ERROR_XXX if error occured
*/
nsresult CWellFormedDTD::HandleCommentToken(CToken* aToken) {
NS_PRECONDITION(0!=aToken,"null token");
nsresult result=NS_OK;
CCommentToken* theToken = (CCommentToken*)aToken;
mLineNumber += CountCharInReadable(theToken->GetStringValue(),
PRUnichar(kNewLine));
nsCParserNode theNode((CHTMLToken*)aToken,mLineNumber,mTokenizer->GetTokenAllocator());
result=(mSink)? mSink->AddComment(theNode):NS_OK;
return result;
}
/**
* This method gets called when a prcessing instruction
* has been encountered in the parse process.
*
* @update harishd 08/18/99
*
* @param aToken -- next token to be handled
* @return NS_OK if all went well; NS_ERROR_XXX if error occured
*/
nsresult CWellFormedDTD::HandleProcessingInstructionToken(CToken* aToken) {
NS_PRECONDITION(0!=aToken,"null token");
nsresult result=NS_OK;
nsCParserNode theNode((CHTMLToken*)aToken,mLineNumber,mTokenizer->GetTokenAllocator());
result=(mSink)? mSink->AddProcessingInstruction(theNode):NS_OK;
return result;
}
/**
* This method gets called when a start token has been
* encountered in the parse process.
*
* @update harishd 08/18/99
*
* @param aToken -- next (start) token to be handled
* @return NS_OK if all went well; NS_ERROR_XXX if error occured
*/
nsresult CWellFormedDTD::HandleStartToken(CToken* aToken) {
NS_PRECONDITION(0!=aToken,"null token");
nsresult result=NS_OK;
nsCParserNode theNode((CHTMLToken*)aToken,mLineNumber,mTokenizer->GetTokenAllocator());
PRInt16 attrCount=aToken->GetAttributeCount();
if(0<attrCount){ //go collect the attributes...
int attr=0;
for(attr=0;attr<attrCount;attr++){
CToken* theInnerToken= (mTokenizer)? mTokenizer->PeekToken():nsnull;
if(theInnerToken) {
eHTMLTokenTypes theInnerType=eHTMLTokenTypes(theInnerToken->GetTokenType());
if(eToken_attribute==theInnerType){
mTokenizer->PopToken(); //pop it for real...
theNode.AddAttribute(theInnerToken);
}
}
else return kEOF;
}
}
// Pass the ID Attribute atom from the start token to the parser node
CStartToken* startToken = NS_STATIC_CAST(CStartToken *, aToken);
nsCOMPtr<nsIAtom> IDAttr=nsnull;
result = startToken->GetIDAttributeAtom(getter_AddRefs(IDAttr));
if (IDAttr && NS_SUCCEEDED(result))
result = theNode.SetIDAttributeAtom(IDAttr);
if(NS_OK==result){
if(mSink) {
result=mSink->OpenContainer(theNode);
if(((CStartToken*)aToken)->IsEmpty()){
result=mSink->CloseContainer(theNode);
}
}
}
return result;
}
/**
* This method gets called when an end token has been
* encountered in the parse process.
*
* @update harishd 08/18/99
*
* @param aToken -- next (end) token to be handled
* @return NS_OK if all went well; NS_ERROR_XXX if error occured
*/
nsresult CWellFormedDTD::HandleEndToken(CToken* aToken) {
NS_PRECONDITION(0!=aToken,"null token");
nsresult result=NS_OK;
nsCParserNode theNode((CHTMLToken*)aToken,mLineNumber,mTokenizer->GetTokenAllocator());
result=(mSink)? mSink->CloseContainer(theNode):NS_OK;
return result;
}
/**
* This method gets called when an error token has been
* encountered in the parse process.
* FYI: when the document is malformed this is the only
* token that will get reported to the content sink.
*
* @update harishd 08/18/99
*
* @param aToken -- next token to be handled
* @return NS_OK if all went well; NS_ERROR_XXX if error occured
*/
nsresult CWellFormedDTD::HandleErrorToken(CToken* aToken) {
NS_PRECONDITION(0!=aToken,"null token");
nsresult result=NS_OK;
if(mTokenizer) {
// Cycle through the remaining tokens in the token stream and handle them
// These tokens were added so that content objects for the error message
// are generated by the content sink
while (PR_TRUE) {
CToken* token = mTokenizer->PopToken();
if(token) {
eHTMLTokenTypes type = (eHTMLTokenTypes) token->GetTokenType();
switch(type) {
case eToken_newline:
mLineNumber++; //now fall through
case eToken_whitespace:
case eToken_text:
HandleLeafToken(token);
break;
case eToken_start:
HandleStartToken(token);
break;
case eToken_end:
HandleEndToken(token);
break;
default:
// Do nothing
break;
}
IF_FREE(token, mTokenizer->GetTokenAllocator());
}
else
break;
}
}
// Propagate the error onto the content sink.
CErrorToken *errTok = (CErrorToken *)aToken;
const nsParserError* error = errTok->GetError();
result=(mSink)? mSink->NotifyError(error):NS_OK;
// Output the error to the console
if (error) {
nsCAutoString temp;
temp.AssignWithConversion(mFilename);
PR_fprintf(PR_STDOUT, "XML Error in file '%s', ", temp.get());
PR_fprintf(PR_STDOUT, "Line Number: %d, ", error->lineNumber);
PR_fprintf(PR_STDOUT, "Col Number: %d, ", error->colNumber);
temp.AssignWithConversion(error->description);
PR_fprintf(PR_STDOUT, "Description: %s\n", temp.get());
temp.AssignWithConversion(error->sourceLine);
PR_fprintf(PR_STDOUT, "Source Line: %s\n", temp.get());
}
return result;
}
/**
* This method gets called when a doc. type token has been
* encountered in the parse process.
*
* @update harishd 08/18/99
*
* @param aToken -- next token to be handled
* @return NS_OK if all went well; NS_ERROR_XXX if error occured
*/
nsresult CWellFormedDTD::HandleDocTypeDeclToken(CToken* aToken) {
NS_PRECONDITION(0!=aToken,"null token");
nsresult result=NS_OK;
nsCParserNode theNode((CHTMLToken*)aToken,mLineNumber,mTokenizer->GetTokenAllocator());
result = (mSink)? mSink->AddDocTypeDecl(theNode, 0):NS_OK;
return result;
}

97
parser/htmlparser/src/nsWellFormedDTD.h
Просмотреть файл

@ -1,97 +0,0 @@
/* -*- Mode: C++; tab-width: 4; 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 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 gess 4/8/98
*
*
*/
#ifndef __NS_WELLFORMED_DTD
#define __NS_WELLFORMED_DTD
#include "nsIDTD.h"
#include "nsISupports.h"
#include "nsHTMLTokens.h"
#include "nsIContentSink.h"
#define NS_WELLFORMED_DTD_IID \
{0xa39c6bfd, 0x15f0, 0x11d2, \
{0x80, 0x41, 0x0, 0x10, 0x4b, 0x98, 0x3f, 0xd4}}
class nsIDTDDebug;
class nsIParserNode;
class nsParser;
class nsHTMLTokenizer;
class CWellFormedDTD : public nsIDTD
{
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIDTD
/**
*
*
* @update gess 4/9/98
* @param
* @return
*/
CWellFormedDTD();
/**
*
*
* @update gess 4/9/98
* @param
* @return
*/
virtual ~CWellFormedDTD();
virtual void SetVerification(PRBool aEnable);
protected:
nsresult HandleStartToken(CToken* aToken);
nsresult HandleEndToken(CToken* aToken);
nsresult HandleCommentToken(CToken* aToken);
nsresult HandleErrorToken(CToken* aToken);
nsresult HandleDocTypeDeclToken(CToken* aToken);
nsresult HandleLeafToken(CToken* aToken);
nsresult HandleProcessingInstructionToken(CToken* aToken);
nsParser* mParser;
nsIContentSink* mSink;
nsString mFilename;
PRInt32 mLineNumber;
nsHTMLTokenizer* mTokenizer;
nsresult mDTDState;
};
extern nsresult NS_NewWellFormed_DTD(nsIDTD** aInstancePtrResult);
#endif