Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 03:45:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replacing ostream to nsStream in DebugDump methods.

Browse Source
This commit is contained in:
harishd%netscape.com 1999-09-02 18:30:31 +00:00
parent bef3eb8080
commit fc87f082cc
16 changed files with 78 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htmlparser/src/CNavDTD.cpp
View File

@ -1057,7 +1057,8 @@ nsresult CNavDTD::HandleDefaultStartToken(CToken* aToken,eHTMLTags aChildTag,nsI
#ifdef RICKG_DEBUG #ifdef RICKG_DEBUG
void WriteTokenToLog(CToken* aToken) { void WriteTokenToLog(CToken* aToken) {
static fstream outputStream("c:/temp/tokenlog.html",ios::out); static nsFileSpec fileSpec("c:\\temp\\tokenlog.html");
static nsOutputFileStream outputStream(fileSpec);
aToken->DebugDumpSource(outputStream); //write token without close bracket... aToken->DebugDumpSource(outputStream); //write token without close bracket...
} }
#endif #endif

13
htmlparser/src/nsDTDDebug.cpp
View File

@ -537,10 +537,19 @@ PRBool CDTDDebug::Verify(nsIDTD * aDTD, nsIParser * aParser, int aContextStackP
if (debugFile) { if (debugFile) {
// dump the html source into the newly created file. // dump the html source into the newly created file.
/******************************************************
* RICKG, DO WE REALLY NEED A FILE DESCRIPTOR HERE? *
******************************************************/
PRofstream ps; PRofstream ps;
ps.attach(debugFile); ps.attach(debugFile);
if (theParser) if (theParser) {
theParser->DebugDumpSource(ps); // XXX Hack Remove file descriptors
nsFileSpec fileSpec(filename);
nsOutputFileStream out(fileSpec);
theParser->DebugDumpSource(out);
//theParser->DebugDumpSource(ps);
}
PR_Close(debugFile); PR_Close(debugFile);
} }
} }

18
htmlparser/src/nsHTMLTokens.cpp
View File

@ -250,7 +250,7 @@ nsresult CStartToken::Consume(PRUnichar aChar, nsScanner& aScanner) {
* @param out -- ostream to output content * @param out -- ostream to output content
* @return * @return
*/ */
void CStartToken::DebugDumpSource(ostream& out) { void CStartToken::DebugDumpSource(nsOutputStream& out) {
char buffer[1000]; char buffer[1000];
mTextValue.ToCString(buffer,sizeof(buffer)); mTextValue.ToCString(buffer,sizeof(buffer));
out << "<" << buffer; out << "<" << buffer;
@ -376,7 +376,7 @@ PRInt32 CEndToken::GetTokenType(void) {
* @param out -- ostream to output content * @param out -- ostream to output content
* @return * @return
*/ */
void CEndToken::DebugDumpSource(ostream& out) { void CEndToken::DebugDumpSource(nsOutputStream& out) {
char buffer[1000]; char buffer[1000];
mTextValue.ToCString(buffer,sizeof(buffer)); mTextValue.ToCString(buffer,sizeof(buffer));
out << "</" << buffer << ">"; out << "</" << buffer << ">";
@ -1085,12 +1085,12 @@ void CAttributeToken::SanitizeKey() {
* @param out -- ostream to output content * @param out -- ostream to output content
* @return * @return
*/ */
void CAttributeToken::DebugDumpToken(ostream& out) { void CAttributeToken::DebugDumpToken(nsOutputStream& out) {
char buffer[200]; char buffer[200];
mTextKey.ToCString(buffer,sizeof(buffer)); mTextKey.ToCString(buffer,sizeof(buffer));
out << "[" << GetClassName() << "] " << buffer << "="; out << "[" << GetClassName() << "] " << buffer << "=";
mTextValue.ToCString(buffer,sizeof(buffer)); mTextValue.ToCString(buffer,sizeof(buffer));
out << buffer << ": " << mTypeID << endl; out << buffer << ": " << mTypeID << nsEndl;
} }
/* /*
@ -1287,7 +1287,7 @@ nsresult CAttributeToken::Consume(PRUnichar aChar, nsScanner& aScanner) {
* @param out -- ostream to output content * @param out -- ostream to output content
* @return * @return
*/ */
void CAttributeToken::DebugDumpSource(ostream& out) { void CAttributeToken::DebugDumpSource(nsOutputStream& out) {
static char buffer[1000]; static char buffer[1000];
mTextKey.ToCString(buffer,sizeof(buffer)); mTextKey.ToCString(buffer,sizeof(buffer));
out << " " << buffer; out << " " << buffer;
@ -1583,7 +1583,7 @@ PRInt32 CEntityToken::TranslateToUnicodeStr(nsString& aString) {
* @param out -- ostream to output content * @param out -- ostream to output content
* @return * @return
*/ */
void CEntityToken::DebugDumpSource(ostream& out) { void CEntityToken::DebugDumpSource(nsOutputStream& out) {
char* cp=mTextValue.ToNewCString(); char* cp=mTextValue.ToNewCString();
out << "&" << *cp; out << "&" << *cp;
delete[] cp; delete[] cp;
@ -1771,7 +1771,7 @@ nsresult CSkippedContentToken::Consume(PRUnichar aChar,nsScanner& aScanner) {
* @param out -- ostream to output content * @param out -- ostream to output content
* @return * @return
*/ */
void CSkippedContentToken::DebugDumpSource(ostream& out) { void CSkippedContentToken::DebugDumpSource(nsOutputStream& out) {
static char buffer[1000]; static char buffer[1000];
mTextKey.ToCString(buffer,sizeof(buffer)); mTextKey.ToCString(buffer,sizeof(buffer));
out << " " << buffer; out << " " << buffer;
@ -1895,6 +1895,10 @@ const nsParserError * CErrorToken::GetError(void)
CDoctypeDeclToken::CDoctypeDeclToken() : CHTMLToken(eHTMLTag_unknown) { CDoctypeDeclToken::CDoctypeDeclToken() : CHTMLToken(eHTMLTag_unknown) {
} }
nsresult CDoctypeDeclToken::Consume(PRUnichar aChar, nsScanner& aScanner) {
return ConsumeComment(aChar,aScanner,mTextValue);
}
const char* CDoctypeDeclToken::GetClassName(void) { const char* CDoctypeDeclToken::GetClassName(void) {
return "doctype"; return "doctype";
} }

14
htmlparser/src/nsHTMLTokens.h
View File

@ -43,7 +43,6 @@
#include "nsHTMLTags.h" #include "nsHTMLTags.h"
#include "nsParserError.h" #include "nsParserError.h"
#include "nsString.h" #include "nsString.h"
#include <iostream.h>
class nsScanner; class nsScanner;
@ -121,7 +120,7 @@ class CStartToken: public CHTMLToken {
void SetAttributed(PRBool aValue); void SetAttributed(PRBool aValue);
PRBool IsEmpty(void); PRBool IsEmpty(void);
void SetEmpty(PRBool aValue); void SetEmpty(PRBool aValue);
virtual void DebugDumpSource(ostream& out); virtual void DebugDumpSource(nsOutputStream& out);
virtual void GetSource(nsString& anOutputString); virtual void GetSource(nsString& anOutputString);
virtual void Reinitialize(PRInt32 aTag, const nsString& aString); virtual void Reinitialize(PRInt32 aTag, const nsString& aString);
@ -147,7 +146,7 @@ class CEndToken: public CHTMLToken {
virtual PRInt32 GetTypeID(void); virtual PRInt32 GetTypeID(void);
virtual const char* GetClassName(void); virtual const char* GetClassName(void);
virtual PRInt32 GetTokenType(void); virtual PRInt32 GetTokenType(void);
virtual void DebugDumpSource(ostream& out); virtual void DebugDumpSource(nsOutputStream& out);
virtual void GetSource(nsString& anOutputString); virtual void GetSource(nsString& anOutputString);
}; };
@ -188,7 +187,7 @@ class CEntityToken : public CHTMLToken {
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner); virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner);
static PRInt32 ConsumeEntity(PRUnichar aChar,nsString& aString,nsScanner& aScanner); static PRInt32 ConsumeEntity(PRUnichar aChar,nsString& aString,nsScanner& aScanner);
static PRInt32 TranslateToUnicodeStr(PRInt32 aValue,nsString& aString); static PRInt32 TranslateToUnicodeStr(PRInt32 aValue,nsString& aString);
virtual void DebugDumpSource(ostream& out); virtual void DebugDumpSource(nsOutputStream& out);
virtual void GetSource(nsString& anOutputString); virtual void GetSource(nsString& anOutputString);
}; };
@ -263,9 +262,9 @@ class CAttributeToken: public CHTMLToken {
virtual PRInt32 GetTokenType(void); virtual PRInt32 GetTokenType(void);
virtual nsString& GetKey(void) {return mTextKey;} virtual nsString& GetKey(void) {return mTextKey;}
virtual void SanitizeKey(); virtual void SanitizeKey();
virtual void DebugDumpToken(ostream& out); virtual void DebugDumpToken(nsOutputStream& out);
virtual void GetSource(nsString& anOutputString); virtual void GetSource(nsString& anOutputString);
virtual void DebugDumpSource(ostream& out); virtual void DebugDumpSource(nsOutputStream& out);
PRBool mLastAttribute; PRBool mLastAttribute;
virtual void Reinitialize(PRInt32 aTag, const nsString& aString); virtual void Reinitialize(PRInt32 aTag, const nsString& aString);
@ -340,7 +339,7 @@ class CSkippedContentToken: public CAttributeToken {
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner); virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner);
virtual const char* GetClassName(void); virtual const char* GetClassName(void);
virtual PRInt32 GetTokenType(void); virtual PRInt32 GetTokenType(void);
virtual void DebugDumpSource(ostream& out); virtual void DebugDumpSource(nsOutputStream& out);
virtual void GetSource(nsString& anOutputString); virtual void GetSource(nsString& anOutputString);
protected: protected:
}; };
@ -389,6 +388,7 @@ protected:
class CDoctypeDeclToken: public CHTMLToken { class CDoctypeDeclToken: public CHTMLToken {
public: public:
CDoctypeDeclToken(); CDoctypeDeclToken();
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner);
virtual const char* GetClassName(void); virtual const char* GetClassName(void);
virtual PRInt32 GetTokenType(void); virtual PRInt32 GetTokenType(void);
}; };

2
htmlparser/src/nsParser.cpp
View File

@ -1437,7 +1437,7 @@ PRBool nsParser::DidTokenize(PRBool aIsFinalChunk){
return result; return result;
} }
void nsParser::DebugDumpSource(ostream& aStream) { void nsParser::DebugDumpSource(nsOutputStream& aStream) {
PRInt32 theIndex=-1; PRInt32 theIndex=-1;
nsITokenizer* theTokenizer=mParserContext->mDTD->GetTokenizer(); nsITokenizer* theTokenizer=mParserContext->mDTD->GetTokenizer();
if(theTokenizer){ if(theTokenizer){

2
htmlparser/src/nsParser.h
View File

@ -235,7 +235,7 @@ friend class CTokenHandler;
*/ */
virtual nsresult ResumeParse(nsIDTD* mDefaultDTD=0, PRBool aIsFinalChunk=PR_FALSE); virtual nsresult ResumeParse(nsIDTD* mDefaultDTD=0, PRBool aIsFinalChunk=PR_FALSE);
void DebugDumpSource(ostream& anOutput); void DebugDumpSource(nsOutputStream& anOutput);
//********************************************* //*********************************************
// These methods are callback methods used by // These methods are callback methods used by

6
htmlparser/src/nsToken.cpp
View File

@ -121,13 +121,13 @@ nsresult CToken::Consume(PRUnichar aChar,nsScanner& aScanner) {
* @update gess 3/25/98 * @update gess 3/25/98
* @param ostream -- output stream to accept output data * @param ostream -- output stream to accept output data
*/ */
void CToken::DebugDumpToken(ostream& anOutputStream) { void CToken::DebugDumpToken(nsOutputStream& anOutputStream) {
anOutputStream << "[" << GetClassName() << "] "; anOutputStream << "[" << GetClassName() << "] ";
int i=0; int i=0;
for(i=0;i<mTextValue.Length();i++){ for(i=0;i<mTextValue.Length();i++){
anOutputStream << char(mTextValue.CharAt(i)); anOutputStream << char(mTextValue.CharAt(i));
} }
anOutputStream << " TypeID: " << mTypeID << " AttrCount: " << mAttrCount << endl; anOutputStream << " TypeID: " << mTypeID << " AttrCount: " << mAttrCount << nsEndl;
} }
/** /**
@ -137,7 +137,7 @@ void CToken::DebugDumpToken(ostream& anOutputStream) {
* @update gess 3/25/98 * @update gess 3/25/98
* @param ostream -- output stream to accept output data * @param ostream -- output stream to accept output data
*/ */
void CToken::DebugDumpSource(ostream& anOutputStream) { void CToken::DebugDumpSource(nsOutputStream& anOutputStream) {
char buf[256]; char buf[256];
mTextValue.ToCString(buf,sizeof(buf)); mTextValue.ToCString(buf,sizeof(buf));
anOutputStream << buf; anOutputStream << buf;

5
htmlparser/src/nsToken.h
View File

@ -39,6 +39,7 @@
#include "nsString.h" #include "nsString.h"
#include <iostream.h> #include <iostream.h>
#include "nsError.h" #include "nsError.h"
#include "nsFileSpec.h"
class nsScanner; class nsScanner;
@ -166,14 +167,14 @@ class CToken {
* @update gess5/11/98 * @update gess5/11/98
* @param out is the output stream where token should write itself * @param out is the output stream where token should write itself
*/ */
virtual void DebugDumpToken(ostream& out); virtual void DebugDumpToken(nsOutputStream& out);
/** /**
* Causes token to dump itself in source form to given output stream * Causes token to dump itself in source form to given output stream
* @update gess5/11/98 * @update gess5/11/98
* @param out is the output stream where token should write itself * @param out is the output stream where token should write itself
*/ */
virtual void DebugDumpSource(ostream& out); virtual void DebugDumpSource(nsOutputStream& out);
/** /**
* Getter which retrieves type of token * Getter which retrieves type of token

3
parser/htmlparser/src/CNavDTD.cpp
View File

@ -1057,7 +1057,8 @@ nsresult CNavDTD::HandleDefaultStartToken(CToken* aToken,eHTMLTags aChildTag,nsI
#ifdef RICKG_DEBUG #ifdef RICKG_DEBUG
void WriteTokenToLog(CToken* aToken) { void WriteTokenToLog(CToken* aToken) {
static fstream outputStream("c:/temp/tokenlog.html",ios::out); static nsFileSpec fileSpec("c:\\temp\\tokenlog.html");
static nsOutputFileStream outputStream(fileSpec);
aToken->DebugDumpSource(outputStream); //write token without close bracket... aToken->DebugDumpSource(outputStream); //write token without close bracket...
} }
#endif #endif

13
parser/htmlparser/src/nsDTDDebug.cpp
View File

@ -537,10 +537,19 @@ PRBool CDTDDebug::Verify(nsIDTD * aDTD, nsIParser * aParser, int aContextStackP
if (debugFile) { if (debugFile) {
// dump the html source into the newly created file. // dump the html source into the newly created file.
/******************************************************
* RICKG, DO WE REALLY NEED A FILE DESCRIPTOR HERE? *
******************************************************/
PRofstream ps; PRofstream ps;
ps.attach(debugFile); ps.attach(debugFile);
if (theParser) if (theParser) {
theParser->DebugDumpSource(ps); // XXX Hack Remove file descriptors
nsFileSpec fileSpec(filename);
nsOutputFileStream out(fileSpec);
theParser->DebugDumpSource(out);
//theParser->DebugDumpSource(ps);
}
PR_Close(debugFile); PR_Close(debugFile);
} }
} }

18
parser/htmlparser/src/nsHTMLTokens.cpp
View File

@ -250,7 +250,7 @@ nsresult CStartToken::Consume(PRUnichar aChar, nsScanner& aScanner) {
* @param out -- ostream to output content * @param out -- ostream to output content
* @return * @return
*/ */
void CStartToken::DebugDumpSource(ostream& out) { void CStartToken::DebugDumpSource(nsOutputStream& out) {
char buffer[1000]; char buffer[1000];
mTextValue.ToCString(buffer,sizeof(buffer)); mTextValue.ToCString(buffer,sizeof(buffer));
out << "<" << buffer; out << "<" << buffer;
@ -376,7 +376,7 @@ PRInt32 CEndToken::GetTokenType(void) {
* @param out -- ostream to output content * @param out -- ostream to output content
* @return * @return
*/ */
void CEndToken::DebugDumpSource(ostream& out) { void CEndToken::DebugDumpSource(nsOutputStream& out) {
char buffer[1000]; char buffer[1000];
mTextValue.ToCString(buffer,sizeof(buffer)); mTextValue.ToCString(buffer,sizeof(buffer));
out << "</" << buffer << ">"; out << "</" << buffer << ">";
@ -1085,12 +1085,12 @@ void CAttributeToken::SanitizeKey() {
* @param out -- ostream to output content * @param out -- ostream to output content
* @return * @return
*/ */
void CAttributeToken::DebugDumpToken(ostream& out) { void CAttributeToken::DebugDumpToken(nsOutputStream& out) {
char buffer[200]; char buffer[200];
mTextKey.ToCString(buffer,sizeof(buffer)); mTextKey.ToCString(buffer,sizeof(buffer));
out << "[" << GetClassName() << "] " << buffer << "="; out << "[" << GetClassName() << "] " << buffer << "=";
mTextValue.ToCString(buffer,sizeof(buffer)); mTextValue.ToCString(buffer,sizeof(buffer));
out << buffer << ": " << mTypeID << endl; out << buffer << ": " << mTypeID << nsEndl;
} }
/* /*
@ -1287,7 +1287,7 @@ nsresult CAttributeToken::Consume(PRUnichar aChar, nsScanner& aScanner) {
* @param out -- ostream to output content * @param out -- ostream to output content
* @return * @return
*/ */
void CAttributeToken::DebugDumpSource(ostream& out) { void CAttributeToken::DebugDumpSource(nsOutputStream& out) {
static char buffer[1000]; static char buffer[1000];
mTextKey.ToCString(buffer,sizeof(buffer)); mTextKey.ToCString(buffer,sizeof(buffer));
out << " " << buffer; out << " " << buffer;
@ -1583,7 +1583,7 @@ PRInt32 CEntityToken::TranslateToUnicodeStr(nsString& aString) {
* @param out -- ostream to output content * @param out -- ostream to output content
* @return * @return
*/ */
void CEntityToken::DebugDumpSource(ostream& out) { void CEntityToken::DebugDumpSource(nsOutputStream& out) {
char* cp=mTextValue.ToNewCString(); char* cp=mTextValue.ToNewCString();
out << "&" << *cp; out << "&" << *cp;
delete[] cp; delete[] cp;
@ -1771,7 +1771,7 @@ nsresult CSkippedContentToken::Consume(PRUnichar aChar,nsScanner& aScanner) {
* @param out -- ostream to output content * @param out -- ostream to output content
* @return * @return
*/ */
void CSkippedContentToken::DebugDumpSource(ostream& out) { void CSkippedContentToken::DebugDumpSource(nsOutputStream& out) {
static char buffer[1000]; static char buffer[1000];
mTextKey.ToCString(buffer,sizeof(buffer)); mTextKey.ToCString(buffer,sizeof(buffer));
out << " " << buffer; out << " " << buffer;
@ -1895,6 +1895,10 @@ const nsParserError * CErrorToken::GetError(void)
CDoctypeDeclToken::CDoctypeDeclToken() : CHTMLToken(eHTMLTag_unknown) { CDoctypeDeclToken::CDoctypeDeclToken() : CHTMLToken(eHTMLTag_unknown) {
} }
nsresult CDoctypeDeclToken::Consume(PRUnichar aChar, nsScanner& aScanner) {
return ConsumeComment(aChar,aScanner,mTextValue);
}
const char* CDoctypeDeclToken::GetClassName(void) { const char* CDoctypeDeclToken::GetClassName(void) {
return "doctype"; return "doctype";
} }

14
parser/htmlparser/src/nsHTMLTokens.h
View File

@ -43,7 +43,6 @@
#include "nsHTMLTags.h" #include "nsHTMLTags.h"
#include "nsParserError.h" #include "nsParserError.h"
#include "nsString.h" #include "nsString.h"
#include <iostream.h>
class nsScanner; class nsScanner;
@ -121,7 +120,7 @@ class CStartToken: public CHTMLToken {
void SetAttributed(PRBool aValue); void SetAttributed(PRBool aValue);
PRBool IsEmpty(void); PRBool IsEmpty(void);
void SetEmpty(PRBool aValue); void SetEmpty(PRBool aValue);
virtual void DebugDumpSource(ostream& out); virtual void DebugDumpSource(nsOutputStream& out);
virtual void GetSource(nsString& anOutputString); virtual void GetSource(nsString& anOutputString);
virtual void Reinitialize(PRInt32 aTag, const nsString& aString); virtual void Reinitialize(PRInt32 aTag, const nsString& aString);
@ -147,7 +146,7 @@ class CEndToken: public CHTMLToken {
virtual PRInt32 GetTypeID(void); virtual PRInt32 GetTypeID(void);
virtual const char* GetClassName(void); virtual const char* GetClassName(void);
virtual PRInt32 GetTokenType(void); virtual PRInt32 GetTokenType(void);
virtual void DebugDumpSource(ostream& out); virtual void DebugDumpSource(nsOutputStream& out);
virtual void GetSource(nsString& anOutputString); virtual void GetSource(nsString& anOutputString);
}; };
@ -188,7 +187,7 @@ class CEntityToken : public CHTMLToken {
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner); virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner);
static PRInt32 ConsumeEntity(PRUnichar aChar,nsString& aString,nsScanner& aScanner); static PRInt32 ConsumeEntity(PRUnichar aChar,nsString& aString,nsScanner& aScanner);
static PRInt32 TranslateToUnicodeStr(PRInt32 aValue,nsString& aString); static PRInt32 TranslateToUnicodeStr(PRInt32 aValue,nsString& aString);
virtual void DebugDumpSource(ostream& out); virtual void DebugDumpSource(nsOutputStream& out);
virtual void GetSource(nsString& anOutputString); virtual void GetSource(nsString& anOutputString);
}; };
@ -263,9 +262,9 @@ class CAttributeToken: public CHTMLToken {
virtual PRInt32 GetTokenType(void); virtual PRInt32 GetTokenType(void);
virtual nsString& GetKey(void) {return mTextKey;} virtual nsString& GetKey(void) {return mTextKey;}
virtual void SanitizeKey(); virtual void SanitizeKey();
virtual void DebugDumpToken(ostream& out); virtual void DebugDumpToken(nsOutputStream& out);
virtual void GetSource(nsString& anOutputString); virtual void GetSource(nsString& anOutputString);
virtual void DebugDumpSource(ostream& out); virtual void DebugDumpSource(nsOutputStream& out);
PRBool mLastAttribute; PRBool mLastAttribute;
virtual void Reinitialize(PRInt32 aTag, const nsString& aString); virtual void Reinitialize(PRInt32 aTag, const nsString& aString);
@ -340,7 +339,7 @@ class CSkippedContentToken: public CAttributeToken {
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner); virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner);
virtual const char* GetClassName(void); virtual const char* GetClassName(void);
virtual PRInt32 GetTokenType(void); virtual PRInt32 GetTokenType(void);
virtual void DebugDumpSource(ostream& out); virtual void DebugDumpSource(nsOutputStream& out);
virtual void GetSource(nsString& anOutputString); virtual void GetSource(nsString& anOutputString);
protected: protected:
}; };
@ -389,6 +388,7 @@ protected:
class CDoctypeDeclToken: public CHTMLToken { class CDoctypeDeclToken: public CHTMLToken {
public: public:
CDoctypeDeclToken(); CDoctypeDeclToken();
virtual nsresult Consume(PRUnichar aChar,nsScanner& aScanner);
virtual const char* GetClassName(void); virtual const char* GetClassName(void);
virtual PRInt32 GetTokenType(void); virtual PRInt32 GetTokenType(void);
}; };

2
parser/htmlparser/src/nsParser.cpp
View File

@ -1437,7 +1437,7 @@ PRBool nsParser::DidTokenize(PRBool aIsFinalChunk){
return result; return result;
} }
void nsParser::DebugDumpSource(ostream& aStream) { void nsParser::DebugDumpSource(nsOutputStream& aStream) {
PRInt32 theIndex=-1; PRInt32 theIndex=-1;
nsITokenizer* theTokenizer=mParserContext->mDTD->GetTokenizer(); nsITokenizer* theTokenizer=mParserContext->mDTD->GetTokenizer();
if(theTokenizer){ if(theTokenizer){

2
parser/htmlparser/src/nsParser.h
View File

@ -235,7 +235,7 @@ friend class CTokenHandler;
*/ */
virtual nsresult ResumeParse(nsIDTD* mDefaultDTD=0, PRBool aIsFinalChunk=PR_FALSE); virtual nsresult ResumeParse(nsIDTD* mDefaultDTD=0, PRBool aIsFinalChunk=PR_FALSE);
void DebugDumpSource(ostream& anOutput); void DebugDumpSource(nsOutputStream& anOutput);
//********************************************* //*********************************************
// These methods are callback methods used by // These methods are callback methods used by

6
parser/htmlparser/src/nsToken.cpp
View File

@ -121,13 +121,13 @@ nsresult CToken::Consume(PRUnichar aChar,nsScanner& aScanner) {
* @update gess 3/25/98 * @update gess 3/25/98
* @param ostream -- output stream to accept output data * @param ostream -- output stream to accept output data
*/ */
void CToken::DebugDumpToken(ostream& anOutputStream) { void CToken::DebugDumpToken(nsOutputStream& anOutputStream) {
anOutputStream << "[" << GetClassName() << "] "; anOutputStream << "[" << GetClassName() << "] ";
int i=0; int i=0;
for(i=0;i<mTextValue.Length();i++){ for(i=0;i<mTextValue.Length();i++){
anOutputStream << char(mTextValue.CharAt(i)); anOutputStream << char(mTextValue.CharAt(i));
} }
anOutputStream << " TypeID: " << mTypeID << " AttrCount: " << mAttrCount << endl; anOutputStream << " TypeID: " << mTypeID << " AttrCount: " << mAttrCount << nsEndl;
} }
/** /**
@ -137,7 +137,7 @@ void CToken::DebugDumpToken(ostream& anOutputStream) {
* @update gess 3/25/98 * @update gess 3/25/98
* @param ostream -- output stream to accept output data * @param ostream -- output stream to accept output data
*/ */
void CToken::DebugDumpSource(ostream& anOutputStream) { void CToken::DebugDumpSource(nsOutputStream& anOutputStream) {
char buf[256]; char buf[256];
mTextValue.ToCString(buf,sizeof(buf)); mTextValue.ToCString(buf,sizeof(buf));
anOutputStream << buf; anOutputStream << buf;

5
parser/htmlparser/src/nsToken.h
View File

@ -39,6 +39,7 @@
#include "nsString.h" #include "nsString.h"
#include <iostream.h> #include <iostream.h>
#include "nsError.h" #include "nsError.h"
#include "nsFileSpec.h"
class nsScanner; class nsScanner;
@ -166,14 +167,14 @@ class CToken {
* @update gess5/11/98 * @update gess5/11/98
* @param out is the output stream where token should write itself * @param out is the output stream where token should write itself
*/ */
virtual void DebugDumpToken(ostream& out); virtual void DebugDumpToken(nsOutputStream& out);
/** /**
* Causes token to dump itself in source form to given output stream * Causes token to dump itself in source form to given output stream
* @update gess5/11/98 * @update gess5/11/98
* @param out is the output stream where token should write itself * @param out is the output stream where token should write itself
*/ */
virtual void DebugDumpSource(ostream& out); virtual void DebugDumpSource(nsOutputStream& out);
/** /**
* Getter which retrieves type of token * Getter which retrieves type of token