From 9bf807ce6a791788520d1eb30967daf91bea4a88 Mon Sep 17 00:00:00 2001 From: "bryner%netscape.com" Date: Fri, 16 May 2003 00:59:04 +0000 Subject: [PATCH] Remove some obsolete code from htmlparser. Bug 205730, r=harishd, sr=jst, a=sspitzer. git-svn-id: svn://10.0.0.236/trunk@142525 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/htmlparser/src/CNavDTD.cpp | 1 - mozilla/htmlparser/src/COtherDTD.cpp | 1 - mozilla/htmlparser/src/nsTagHandler.h | 167 --------- mozilla/htmlparser/src/prstrm.cpp | 362 ------------------- mozilla/htmlparser/src/prstrm.h | 145 -------- mozilla/parser/htmlparser/src/CNavDTD.cpp | 1 - mozilla/parser/htmlparser/src/COtherDTD.cpp | 1 - mozilla/parser/htmlparser/src/nsTagHandler.h | 167 --------- mozilla/parser/htmlparser/src/prstrm.cpp | 362 ------------------- mozilla/parser/htmlparser/src/prstrm.h | 145 -------- 10 files changed, 1352 deletions(-) delete mode 100644 mozilla/htmlparser/src/nsTagHandler.h delete mode 100644 mozilla/htmlparser/src/prstrm.cpp delete mode 100644 mozilla/htmlparser/src/prstrm.h delete mode 100644 mozilla/parser/htmlparser/src/nsTagHandler.h delete mode 100644 mozilla/parser/htmlparser/src/prstrm.cpp delete mode 100644 mozilla/parser/htmlparser/src/prstrm.h diff --git a/mozilla/htmlparser/src/CNavDTD.cpp b/mozilla/htmlparser/src/CNavDTD.cpp index 4ab012bde4d..dce41273d8d 100644 --- a/mozilla/htmlparser/src/CNavDTD.cpp +++ b/mozilla/htmlparser/src/CNavDTD.cpp @@ -56,7 +56,6 @@ #include "prio.h" #include "plstr.h" #include "nsDTDUtils.h" -#include "nsTagHandler.h" #include "nsHTMLTokenizer.h" #include "nsTime.h" #include "nsViewSourceHTML.h" diff --git a/mozilla/htmlparser/src/COtherDTD.cpp b/mozilla/htmlparser/src/COtherDTD.cpp index bdfabd2089e..02df54aa77f 100644 --- a/mozilla/htmlparser/src/COtherDTD.cpp +++ b/mozilla/htmlparser/src/COtherDTD.cpp @@ -53,7 +53,6 @@ #include "prio.h" #include "plstr.h" #include "nsDTDUtils.h" -#include "nsTagHandler.h" #include "nsHTMLTokenizer.h" #include "nsTime.h" #include "nsViewSourceHTML.h" diff --git a/mozilla/htmlparser/src/nsTagHandler.h b/mozilla/htmlparser/src/nsTagHandler.h deleted file mode 100644 index bff08b5609f..00000000000 --- a/mozilla/htmlparser/src/nsTagHandler.h +++ /dev/null @@ -1,167 +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 ***** */ -#ifndef NS_TAGHANDLER___ -#define NS_TAGHANDLER___ - - -#include "nsDTDUtils.h" -#include "nsString.h" - -/** - * MODULE NOTES: - * @update dc 11/20/98 - **/ - - -/** - * This class defines an object that can do special tag handling - * - * @update DC 11/20/98 - */ -class nsTagHandler : public nsITagHandler { - -public: - nsAutoString mTheTagName; //ok as autostring; VERY few if any get used. - -public: - - /** - * Constructor - * @update dc 11/05/98 - */ - nsTagHandler() {} - - - /** - * Destructor - * @update dc 11/05/98 - */ - virtual ~nsTagHandler() {} - - /** - * Sets the string (tag) for this nsTagHandler to handle - * @update dc 11/19/98 - * @param aTheString -- The string (tag) associated with this handler - * @return VOID - */ - void SetString(const nsString &aTheString) {mTheTagName.Assign(aTheString);} - - /** - * Returns the string (tag) handled by this nsTagHandler - * @update dc 11/19/98 - * @return The tagname associated with this class - */ - nsString* GetString() {return &mTheTagName;} - - /** - * Handle this tag prior to the DTD - * @update dc 11/5/98 - * @return A boolean indicating if this token was handled here - */ - virtual PRBool HandleToken(CToken* aToken,nsIDTD* aDTD) {return PR_FALSE;}; - - /** - * Handle this tag prior to the DTD - * @update dc 11/5/98 - * @return A boolean indicating if this token was handled here - */ - virtual PRBool HandleCapturedTokens(CToken* aToken,nsIDTD* aDTD) {return PR_FALSE;}; - -}; - - -/** - * This class defines an object that describes the baseline group that a given - * element belongs to. - * - * @update rgess 1/15/00 - */ -class nsElementGroup { -public: - nsElementGroup(PRInt32 aGroupBits) { - mGroupBits=aGroupBits; - } - - nsElementGroup(const nsElementGroup& aGroup) { - mGroupBits=aGroup.mGroupBits; - } - - nsElementGroup& operator=(const nsElementGroup& aGroup) { - mGroupBits=aGroup.mGroupBits; - return *this; - } - - ~nsElementGroup() { - mGroupBits=0; - } - -private: - PRInt32 mGroupBits; -}; - - -/** - * This class defines an object that describes the each element (tag). - * - * @update rgess 1/15/00 - */ -class nsElement { -public: - nsElement() { - mGroup=0; - } - - nsElement(const nsElement& aGroup){ - mGroup=aGroup.mGroup; - } - - nsElement& operator=(const nsElement& aGroup) { - mGroup=aGroup.mGroup; - return *this; - } - - ~nsElement() { - mGroup=0; - } - -private: - nsElementGroup* mGroup; -}; - - -#endif diff --git a/mozilla/htmlparser/src/prstrm.cpp b/mozilla/htmlparser/src/prstrm.cpp deleted file mode 100644 index 8f0665ffb26..00000000000 --- a/mozilla/htmlparser/src/prstrm.cpp +++ /dev/null @@ -1,362 +0,0 @@ -/* -*- Mode: C; tab-width: 4; 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 Communicator client 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 ***** */ -#include "prtypes.h" -#include "prstrm.h" -#include - -const PRIntn STRM_BUFSIZ = 8192; - -PRfilebuf::PRfilebuf(): -_fd(0), -_opened(PR_FALSE), -_allocated(PR_FALSE) -{ -} - -PRfilebuf::PRfilebuf(PRFileDesc *filedesc): -streambuf(), -_fd(filedesc), -_opened(PR_FALSE), -_allocated(PR_FALSE) -{ -} - -PRfilebuf::PRfilebuf(PRFileDesc *filedesc, char * buffptr, int bufflen): -_fd(filedesc), -_opened(PR_FALSE), -_allocated(PR_FALSE) -{ - PRfilebuf::setbuf(buffptr, bufflen); -} - -PRfilebuf::~PRfilebuf() -{ - if (_opened){ - close(); - }else - sync(); - if (_allocated) - delete base(); -} - -PRfilebuf* -PRfilebuf::open(const char *name, int mode, int flags) -{ - if (_fd != 0) - return 0; // error if already open - PRIntn PRmode = 0; - // translate mode argument - if (!(mode & ios::nocreate)) - PRmode |= PR_CREATE_FILE; - //if (mode & ios::noreplace) - // PRmode |= O_EXCL; - if (mode & ios::app){ - mode |= ios::out; - PRmode |= PR_APPEND; - } - if (mode & ios::trunc){ - mode |= ios::out; // IMPLIED - PRmode |= PR_TRUNCATE; - } - if (mode & ios::out){ - if (mode & ios::in) - PRmode |= PR_RDWR; - else - PRmode |= PR_WRONLY; - if (!(mode & (ios::in|ios::app|ios::ate|ios::noreplace))){ - mode |= ios::trunc; // IMPLIED - PRmode |= PR_TRUNCATE; - } - }else if (mode & ios::in) - PRmode |= PR_RDONLY; - else - return 0; // error if not ios:in or ios::out - - - // - // The usual portable across unix crap... - // NT gets a hokey piece of junk layer that prevents - // access to the API. -#ifdef WIN32 - _fd = PR_Open(name, PRmode, PRmode); -#else - _fd = PR_Open(name, PRmode, flags); -#endif - if (_fd == 0) - return 0; - _opened = PR_TRUE; - if ((!unbuffered()) && (!ebuf())){ - char * sbuf = new char[STRM_BUFSIZ]; - if (!sbuf) - unbuffered(1); - else{ - _allocated = PR_TRUE; - streambuf::setb(sbuf,sbuf+STRM_BUFSIZ,0); - } - } - if (mode & ios::ate){ - if (seekoff(0,ios::end,mode)==EOF){ - close(); - return 0; - } - } - return this; -} - -PRfilebuf* -PRfilebuf::attach(PRFileDesc *filedesc) -{ - _opened = PR_FALSE; - _fd = filedesc; - return this; -} - -int -PRfilebuf::overflow(int c) -{ - if (allocate()==EOF) // make sure there is a reserve area - return EOF; - if (PRfilebuf::sync()==EOF) // sync before new buffer created below - return EOF; - - if (!unbuffered()) - setp(base(),ebuf()); - - if (c!=EOF){ - if ((!unbuffered()) && (pptr() < epptr())) // guard against recursion - sputc(c); - else{ - if (PR_Write(_fd, &c, 1)!=1) - return(EOF); - } - } - return(1); // return something other than EOF if successful -} - -int -PRfilebuf::underflow() -{ - int count; - unsigned char tbuf; - - if (in_avail()) - return (int)(unsigned char) *gptr(); - - if (allocate()==EOF) // make sure there is a reserve area - return EOF; - if (PRfilebuf::sync()==EOF) - return EOF; - - if (unbuffered()) - { - if (PR_Read(_fd,(void *)&tbuf,1)<=0) - return EOF; - return (int)tbuf; - } - - if ((count=PR_Read(_fd,(void *)base(),blen())) <= 0) - return EOF; // reached EOF - setg(base(),base(),base()+count); - return (int)(unsigned char) *gptr(); -} - -streambuf* -PRfilebuf::setbuf(char *buffptr, int bufflen) -{ - if (is_open() && (ebuf())) - return 0; - if ((!buffptr) || (bufflen <= 0)) - unbuffered(1); - else - setb(buffptr, buffptr+bufflen, 0); - return this; -} - -streampos -PRfilebuf::seekoff(streamoff offset, ios::seek_dir dir, int /* mode */) -{ - if (PR_GetDescType(_fd) == PR_DESC_FILE){ - PRSeekWhence fdir; - PRInt32 retpos; - switch (dir) { - case ios::beg : - fdir = PR_SEEK_SET; - break; - case ios::cur : - fdir = PR_SEEK_CUR; - break; - case ios::end : - fdir = PR_SEEK_END; - break; - default: - // error - return(EOF); - } - - if (PRfilebuf::sync()==EOF) - return EOF; - if ((retpos=PR_Seek(_fd, offset, fdir))==-1L) - return (EOF); - return((streampos)retpos); - }else - return (EOF); -} - - -int -PRfilebuf::sync() -{ - PRInt32 count; - - if (_fd==0) - return(EOF); - - if (!unbuffered()){ - // Sync write area - if ((count=out_waiting())!=0){ - PRInt32 nout; - if ((nout =PR_Write(_fd, - (void *) pbase(), - (unsigned int)count)) != count){ - if (nout > 0) { - // should set _pptr -= nout - pbump(-(int)nout); - memmove(pbase(), pbase()+nout, (int)(count-nout)); - } - return(EOF); - } - } - setp(0,0); // empty put area - - if (PR_GetDescType(_fd) == PR_DESC_FILE){ - // Sockets can't seek; don't need this - if ((count=in_avail()) > 0){ - if (PR_Seek(_fd, -count, PR_SEEK_CUR)!=-1L) - { - return (EOF); - } - } - } - setg(0,0,0); // empty get area - } - return(0); -} - -PRfilebuf * -PRfilebuf::close() -{ - int retval; - if (_fd==0) - return 0; - - retval = sync(); - - if ((PR_Close(_fd)==0) || (retval==EOF)) - return 0; - _fd = 0; - return this; -} - -PRofstream::PRofstream(): -ostream(new PRfilebuf) -{ - _PRSTR_DELBUF(0); -} - -PRofstream::PRofstream(PRFileDesc *filedesc): -ostream(new PRfilebuf(filedesc)) -{ - _PRSTR_DELBUF(0); -} - -PRofstream::PRofstream(PRFileDesc *filedesc, char *buff, int bufflen): -ostream(new PRfilebuf(filedesc, buff, bufflen)) -{ - _PRSTR_DELBUF(0); -} - -PRofstream::PRofstream(const char *name, int mode, int aFlags): -ostream(new PRfilebuf) -{ - _PRSTR_DELBUF(0); - if (!rdbuf()->open(name, (mode|ios::out), aFlags)) - clear(rdstate() | ios::failbit); -} - -PRofstream::~PRofstream() -{ - flush(); - - delete rdbuf(); -#ifdef _PRSTR_BP - _PRSTR_BP = 0; -#endif -} - -streambuf * -PRofstream::setbuf(char * ptr, int len) -{ - if ((is_open()) || (!(rdbuf()->setbuf(ptr, len)))){ - clear(rdstate() | ios::failbit); - return 0; - } - return rdbuf(); -} - -void -PRofstream::attach(PRFileDesc *filedesc) -{ - if (!(rdbuf()->attach(filedesc))) - clear(rdstate() | ios::failbit); -} - -void -PRofstream::open(const char * name, int mode, int aFlags) -{ - if (is_open() || !(rdbuf()->open(name, (mode|ios::out), aFlags))) - clear(rdstate() | ios::failbit); -} - -void -PRofstream::close() -{ - clear((rdbuf()->close()) ? 0 : (rdstate() | ios::failbit)); -} - - - diff --git a/mozilla/htmlparser/src/prstrm.h b/mozilla/htmlparser/src/prstrm.h deleted file mode 100644 index dec51c8995f..00000000000 --- a/mozilla/htmlparser/src/prstrm.h +++ /dev/null @@ -1,145 +0,0 @@ -/* -*- Mode: C; tab-width: 4; 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 Communicator client 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 ***** */ - -// The originals are in: nsprpub/lib/pstreams/ -// currently not being built into nspr.. these files will go away. - -#ifndef __PRSTRM -#define __PRSTRM - -#include "prtypes.h" -#include "prio.h" -#include - -#ifdef XP_MAC - -class PRofstream : public ofstream -{ -public: - inline void attach(PRFileDesc *) {}; -}; - -#else - - -#if defined(__GNUC__) -#define _PRSTR_BP _strbuf -#define _PRSTR_DELBUF(x) /* as nothing */ -#define _PRSTR_DELBUF_C(c, x) /* as nothing */ -#elif defined(WIN32) -#define _PRSTR_BP bp -#define _PRSTR_DELBUF(x) delbuf(x) -#define _PRSTR_DELBUF_C(c, x) c::_PRSTR_DELBUF(x) -#elif defined(VMS) -#undef _PRSTR_BP -#define _PRSTR_DELBUF(x) /* as nothing */ -#define _PRSTR_DELBUF_C(c, x) /* as nothing */ -#elif defined(OSF1) -#define _PRSTR_BP m_psb -#define _PRSTR_DELBUF(x) /* as nothing */ -#define _PRSTR_DELBUF_C(c, x) /* as nothing */ -#elif defined(__QNX__) -#undef _PRSTR_BP -#define _PRSTR_DELBUF(x) /* as nothing */ -#define _PRSTR_DELBUF_C(c, x) /* as nothing */ -#else -#define _PRSTR_BP bp -// Unix compilers do not believe in encapsulation -// At least on Solaris this is also ignored -#define _PRSTR_DELBUF(x) delbuf = x -#define _PRSTR_DELBUF_C(c, x) c::_PRSTR_DELBUF(x) -#endif - -#ifndef XP_MAC -class PR_IMPLEMENT(PRfilebuf): public streambuf -#else -__declspec(export) class PRfilebuf : public streambuf -#endif -{ -public: - PRfilebuf(); - PRfilebuf(PRFileDesc *fd); - PRfilebuf(PRFileDesc *fd, char * buffptr, int bufflen); - ~PRfilebuf(); - virtual int overflow(int=EOF); - virtual int underflow(); - virtual streambuf *setbuf(char *buff, int bufflen); -#ifndef XP_MAC - virtual streampos seekoff(streamoff, ios::seek_dir, int); -#else - virtual streampos seekoff(streamoff, ios_base::seekdir, int); -#endif - virtual int sync(); - PRfilebuf *open(const char *name, int mode, int flags); - PRfilebuf *attach(PRFileDesc *fd); - PRfilebuf *close(); - int is_open() const {return (_fd != 0);} - PRFileDesc *fd(){return _fd;} - -private: - PRFileDesc * _fd; - PRPackedBool _opened; - PRPackedBool _allocated; -}; - - -#ifndef XP_MAC -class PR_IMPLEMENT(PRofstream) : public ostream { -#else -__declspec(export) class PRofstream : public ostream { -#endif -public: - PRofstream(); - PRofstream(const char *, int mode=ios::out, int flags = 0); - PRofstream(PRFileDesc *); - PRofstream(PRFileDesc *, char *, int); - ~PRofstream(); - - streambuf * setbuf(char *, int); - PRfilebuf* rdbuf() { return (PRfilebuf*) ios::rdbuf(); } - - void attach(PRFileDesc *); - PRFileDesc *fd() {return rdbuf()->fd();} - - int is_open(){return rdbuf()->is_open();} - void open(const char *, int =ios::out, int = 0); - void close(); -}; - -#endif /* XP_MAC */ -#endif /* __PRSTRM */ diff --git a/mozilla/parser/htmlparser/src/CNavDTD.cpp b/mozilla/parser/htmlparser/src/CNavDTD.cpp index 4ab012bde4d..dce41273d8d 100644 --- a/mozilla/parser/htmlparser/src/CNavDTD.cpp +++ b/mozilla/parser/htmlparser/src/CNavDTD.cpp @@ -56,7 +56,6 @@ #include "prio.h" #include "plstr.h" #include "nsDTDUtils.h" -#include "nsTagHandler.h" #include "nsHTMLTokenizer.h" #include "nsTime.h" #include "nsViewSourceHTML.h" diff --git a/mozilla/parser/htmlparser/src/COtherDTD.cpp b/mozilla/parser/htmlparser/src/COtherDTD.cpp index bdfabd2089e..02df54aa77f 100644 --- a/mozilla/parser/htmlparser/src/COtherDTD.cpp +++ b/mozilla/parser/htmlparser/src/COtherDTD.cpp @@ -53,7 +53,6 @@ #include "prio.h" #include "plstr.h" #include "nsDTDUtils.h" -#include "nsTagHandler.h" #include "nsHTMLTokenizer.h" #include "nsTime.h" #include "nsViewSourceHTML.h" diff --git a/mozilla/parser/htmlparser/src/nsTagHandler.h b/mozilla/parser/htmlparser/src/nsTagHandler.h deleted file mode 100644 index bff08b5609f..00000000000 --- a/mozilla/parser/htmlparser/src/nsTagHandler.h +++ /dev/null @@ -1,167 +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 ***** */ -#ifndef NS_TAGHANDLER___ -#define NS_TAGHANDLER___ - - -#include "nsDTDUtils.h" -#include "nsString.h" - -/** - * MODULE NOTES: - * @update dc 11/20/98 - **/ - - -/** - * This class defines an object that can do special tag handling - * - * @update DC 11/20/98 - */ -class nsTagHandler : public nsITagHandler { - -public: - nsAutoString mTheTagName; //ok as autostring; VERY few if any get used. - -public: - - /** - * Constructor - * @update dc 11/05/98 - */ - nsTagHandler() {} - - - /** - * Destructor - * @update dc 11/05/98 - */ - virtual ~nsTagHandler() {} - - /** - * Sets the string (tag) for this nsTagHandler to handle - * @update dc 11/19/98 - * @param aTheString -- The string (tag) associated with this handler - * @return VOID - */ - void SetString(const nsString &aTheString) {mTheTagName.Assign(aTheString);} - - /** - * Returns the string (tag) handled by this nsTagHandler - * @update dc 11/19/98 - * @return The tagname associated with this class - */ - nsString* GetString() {return &mTheTagName;} - - /** - * Handle this tag prior to the DTD - * @update dc 11/5/98 - * @return A boolean indicating if this token was handled here - */ - virtual PRBool HandleToken(CToken* aToken,nsIDTD* aDTD) {return PR_FALSE;}; - - /** - * Handle this tag prior to the DTD - * @update dc 11/5/98 - * @return A boolean indicating if this token was handled here - */ - virtual PRBool HandleCapturedTokens(CToken* aToken,nsIDTD* aDTD) {return PR_FALSE;}; - -}; - - -/** - * This class defines an object that describes the baseline group that a given - * element belongs to. - * - * @update rgess 1/15/00 - */ -class nsElementGroup { -public: - nsElementGroup(PRInt32 aGroupBits) { - mGroupBits=aGroupBits; - } - - nsElementGroup(const nsElementGroup& aGroup) { - mGroupBits=aGroup.mGroupBits; - } - - nsElementGroup& operator=(const nsElementGroup& aGroup) { - mGroupBits=aGroup.mGroupBits; - return *this; - } - - ~nsElementGroup() { - mGroupBits=0; - } - -private: - PRInt32 mGroupBits; -}; - - -/** - * This class defines an object that describes the each element (tag). - * - * @update rgess 1/15/00 - */ -class nsElement { -public: - nsElement() { - mGroup=0; - } - - nsElement(const nsElement& aGroup){ - mGroup=aGroup.mGroup; - } - - nsElement& operator=(const nsElement& aGroup) { - mGroup=aGroup.mGroup; - return *this; - } - - ~nsElement() { - mGroup=0; - } - -private: - nsElementGroup* mGroup; -}; - - -#endif diff --git a/mozilla/parser/htmlparser/src/prstrm.cpp b/mozilla/parser/htmlparser/src/prstrm.cpp deleted file mode 100644 index 8f0665ffb26..00000000000 --- a/mozilla/parser/htmlparser/src/prstrm.cpp +++ /dev/null @@ -1,362 +0,0 @@ -/* -*- Mode: C; tab-width: 4; 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 Communicator client 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 ***** */ -#include "prtypes.h" -#include "prstrm.h" -#include - -const PRIntn STRM_BUFSIZ = 8192; - -PRfilebuf::PRfilebuf(): -_fd(0), -_opened(PR_FALSE), -_allocated(PR_FALSE) -{ -} - -PRfilebuf::PRfilebuf(PRFileDesc *filedesc): -streambuf(), -_fd(filedesc), -_opened(PR_FALSE), -_allocated(PR_FALSE) -{ -} - -PRfilebuf::PRfilebuf(PRFileDesc *filedesc, char * buffptr, int bufflen): -_fd(filedesc), -_opened(PR_FALSE), -_allocated(PR_FALSE) -{ - PRfilebuf::setbuf(buffptr, bufflen); -} - -PRfilebuf::~PRfilebuf() -{ - if (_opened){ - close(); - }else - sync(); - if (_allocated) - delete base(); -} - -PRfilebuf* -PRfilebuf::open(const char *name, int mode, int flags) -{ - if (_fd != 0) - return 0; // error if already open - PRIntn PRmode = 0; - // translate mode argument - if (!(mode & ios::nocreate)) - PRmode |= PR_CREATE_FILE; - //if (mode & ios::noreplace) - // PRmode |= O_EXCL; - if (mode & ios::app){ - mode |= ios::out; - PRmode |= PR_APPEND; - } - if (mode & ios::trunc){ - mode |= ios::out; // IMPLIED - PRmode |= PR_TRUNCATE; - } - if (mode & ios::out){ - if (mode & ios::in) - PRmode |= PR_RDWR; - else - PRmode |= PR_WRONLY; - if (!(mode & (ios::in|ios::app|ios::ate|ios::noreplace))){ - mode |= ios::trunc; // IMPLIED - PRmode |= PR_TRUNCATE; - } - }else if (mode & ios::in) - PRmode |= PR_RDONLY; - else - return 0; // error if not ios:in or ios::out - - - // - // The usual portable across unix crap... - // NT gets a hokey piece of junk layer that prevents - // access to the API. -#ifdef WIN32 - _fd = PR_Open(name, PRmode, PRmode); -#else - _fd = PR_Open(name, PRmode, flags); -#endif - if (_fd == 0) - return 0; - _opened = PR_TRUE; - if ((!unbuffered()) && (!ebuf())){ - char * sbuf = new char[STRM_BUFSIZ]; - if (!sbuf) - unbuffered(1); - else{ - _allocated = PR_TRUE; - streambuf::setb(sbuf,sbuf+STRM_BUFSIZ,0); - } - } - if (mode & ios::ate){ - if (seekoff(0,ios::end,mode)==EOF){ - close(); - return 0; - } - } - return this; -} - -PRfilebuf* -PRfilebuf::attach(PRFileDesc *filedesc) -{ - _opened = PR_FALSE; - _fd = filedesc; - return this; -} - -int -PRfilebuf::overflow(int c) -{ - if (allocate()==EOF) // make sure there is a reserve area - return EOF; - if (PRfilebuf::sync()==EOF) // sync before new buffer created below - return EOF; - - if (!unbuffered()) - setp(base(),ebuf()); - - if (c!=EOF){ - if ((!unbuffered()) && (pptr() < epptr())) // guard against recursion - sputc(c); - else{ - if (PR_Write(_fd, &c, 1)!=1) - return(EOF); - } - } - return(1); // return something other than EOF if successful -} - -int -PRfilebuf::underflow() -{ - int count; - unsigned char tbuf; - - if (in_avail()) - return (int)(unsigned char) *gptr(); - - if (allocate()==EOF) // make sure there is a reserve area - return EOF; - if (PRfilebuf::sync()==EOF) - return EOF; - - if (unbuffered()) - { - if (PR_Read(_fd,(void *)&tbuf,1)<=0) - return EOF; - return (int)tbuf; - } - - if ((count=PR_Read(_fd,(void *)base(),blen())) <= 0) - return EOF; // reached EOF - setg(base(),base(),base()+count); - return (int)(unsigned char) *gptr(); -} - -streambuf* -PRfilebuf::setbuf(char *buffptr, int bufflen) -{ - if (is_open() && (ebuf())) - return 0; - if ((!buffptr) || (bufflen <= 0)) - unbuffered(1); - else - setb(buffptr, buffptr+bufflen, 0); - return this; -} - -streampos -PRfilebuf::seekoff(streamoff offset, ios::seek_dir dir, int /* mode */) -{ - if (PR_GetDescType(_fd) == PR_DESC_FILE){ - PRSeekWhence fdir; - PRInt32 retpos; - switch (dir) { - case ios::beg : - fdir = PR_SEEK_SET; - break; - case ios::cur : - fdir = PR_SEEK_CUR; - break; - case ios::end : - fdir = PR_SEEK_END; - break; - default: - // error - return(EOF); - } - - if (PRfilebuf::sync()==EOF) - return EOF; - if ((retpos=PR_Seek(_fd, offset, fdir))==-1L) - return (EOF); - return((streampos)retpos); - }else - return (EOF); -} - - -int -PRfilebuf::sync() -{ - PRInt32 count; - - if (_fd==0) - return(EOF); - - if (!unbuffered()){ - // Sync write area - if ((count=out_waiting())!=0){ - PRInt32 nout; - if ((nout =PR_Write(_fd, - (void *) pbase(), - (unsigned int)count)) != count){ - if (nout > 0) { - // should set _pptr -= nout - pbump(-(int)nout); - memmove(pbase(), pbase()+nout, (int)(count-nout)); - } - return(EOF); - } - } - setp(0,0); // empty put area - - if (PR_GetDescType(_fd) == PR_DESC_FILE){ - // Sockets can't seek; don't need this - if ((count=in_avail()) > 0){ - if (PR_Seek(_fd, -count, PR_SEEK_CUR)!=-1L) - { - return (EOF); - } - } - } - setg(0,0,0); // empty get area - } - return(0); -} - -PRfilebuf * -PRfilebuf::close() -{ - int retval; - if (_fd==0) - return 0; - - retval = sync(); - - if ((PR_Close(_fd)==0) || (retval==EOF)) - return 0; - _fd = 0; - return this; -} - -PRofstream::PRofstream(): -ostream(new PRfilebuf) -{ - _PRSTR_DELBUF(0); -} - -PRofstream::PRofstream(PRFileDesc *filedesc): -ostream(new PRfilebuf(filedesc)) -{ - _PRSTR_DELBUF(0); -} - -PRofstream::PRofstream(PRFileDesc *filedesc, char *buff, int bufflen): -ostream(new PRfilebuf(filedesc, buff, bufflen)) -{ - _PRSTR_DELBUF(0); -} - -PRofstream::PRofstream(const char *name, int mode, int aFlags): -ostream(new PRfilebuf) -{ - _PRSTR_DELBUF(0); - if (!rdbuf()->open(name, (mode|ios::out), aFlags)) - clear(rdstate() | ios::failbit); -} - -PRofstream::~PRofstream() -{ - flush(); - - delete rdbuf(); -#ifdef _PRSTR_BP - _PRSTR_BP = 0; -#endif -} - -streambuf * -PRofstream::setbuf(char * ptr, int len) -{ - if ((is_open()) || (!(rdbuf()->setbuf(ptr, len)))){ - clear(rdstate() | ios::failbit); - return 0; - } - return rdbuf(); -} - -void -PRofstream::attach(PRFileDesc *filedesc) -{ - if (!(rdbuf()->attach(filedesc))) - clear(rdstate() | ios::failbit); -} - -void -PRofstream::open(const char * name, int mode, int aFlags) -{ - if (is_open() || !(rdbuf()->open(name, (mode|ios::out), aFlags))) - clear(rdstate() | ios::failbit); -} - -void -PRofstream::close() -{ - clear((rdbuf()->close()) ? 0 : (rdstate() | ios::failbit)); -} - - - diff --git a/mozilla/parser/htmlparser/src/prstrm.h b/mozilla/parser/htmlparser/src/prstrm.h deleted file mode 100644 index dec51c8995f..00000000000 --- a/mozilla/parser/htmlparser/src/prstrm.h +++ /dev/null @@ -1,145 +0,0 @@ -/* -*- Mode: C; tab-width: 4; 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 Communicator client 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 ***** */ - -// The originals are in: nsprpub/lib/pstreams/ -// currently not being built into nspr.. these files will go away. - -#ifndef __PRSTRM -#define __PRSTRM - -#include "prtypes.h" -#include "prio.h" -#include - -#ifdef XP_MAC - -class PRofstream : public ofstream -{ -public: - inline void attach(PRFileDesc *) {}; -}; - -#else - - -#if defined(__GNUC__) -#define _PRSTR_BP _strbuf -#define _PRSTR_DELBUF(x) /* as nothing */ -#define _PRSTR_DELBUF_C(c, x) /* as nothing */ -#elif defined(WIN32) -#define _PRSTR_BP bp -#define _PRSTR_DELBUF(x) delbuf(x) -#define _PRSTR_DELBUF_C(c, x) c::_PRSTR_DELBUF(x) -#elif defined(VMS) -#undef _PRSTR_BP -#define _PRSTR_DELBUF(x) /* as nothing */ -#define _PRSTR_DELBUF_C(c, x) /* as nothing */ -#elif defined(OSF1) -#define _PRSTR_BP m_psb -#define _PRSTR_DELBUF(x) /* as nothing */ -#define _PRSTR_DELBUF_C(c, x) /* as nothing */ -#elif defined(__QNX__) -#undef _PRSTR_BP -#define _PRSTR_DELBUF(x) /* as nothing */ -#define _PRSTR_DELBUF_C(c, x) /* as nothing */ -#else -#define _PRSTR_BP bp -// Unix compilers do not believe in encapsulation -// At least on Solaris this is also ignored -#define _PRSTR_DELBUF(x) delbuf = x -#define _PRSTR_DELBUF_C(c, x) c::_PRSTR_DELBUF(x) -#endif - -#ifndef XP_MAC -class PR_IMPLEMENT(PRfilebuf): public streambuf -#else -__declspec(export) class PRfilebuf : public streambuf -#endif -{ -public: - PRfilebuf(); - PRfilebuf(PRFileDesc *fd); - PRfilebuf(PRFileDesc *fd, char * buffptr, int bufflen); - ~PRfilebuf(); - virtual int overflow(int=EOF); - virtual int underflow(); - virtual streambuf *setbuf(char *buff, int bufflen); -#ifndef XP_MAC - virtual streampos seekoff(streamoff, ios::seek_dir, int); -#else - virtual streampos seekoff(streamoff, ios_base::seekdir, int); -#endif - virtual int sync(); - PRfilebuf *open(const char *name, int mode, int flags); - PRfilebuf *attach(PRFileDesc *fd); - PRfilebuf *close(); - int is_open() const {return (_fd != 0);} - PRFileDesc *fd(){return _fd;} - -private: - PRFileDesc * _fd; - PRPackedBool _opened; - PRPackedBool _allocated; -}; - - -#ifndef XP_MAC -class PR_IMPLEMENT(PRofstream) : public ostream { -#else -__declspec(export) class PRofstream : public ostream { -#endif -public: - PRofstream(); - PRofstream(const char *, int mode=ios::out, int flags = 0); - PRofstream(PRFileDesc *); - PRofstream(PRFileDesc *, char *, int); - ~PRofstream(); - - streambuf * setbuf(char *, int); - PRfilebuf* rdbuf() { return (PRfilebuf*) ios::rdbuf(); } - - void attach(PRFileDesc *); - PRFileDesc *fd() {return rdbuf()->fd();} - - int is_open(){return rdbuf()->is_open();} - void open(const char *, int =ios::out, int = 0); - void close(); -}; - -#endif /* XP_MAC */ -#endif /* __PRSTRM */