missing part of backing out 81414, yac

git-svn-id: svn://10.0.0.236/trunk@96809 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
axel%pike.org
2001-06-10 13:50:59 +00:00
parent 12224ab698
commit fc2c8ff0f5
31 changed files with 92 additions and 84 deletions

View File

@@ -28,7 +28,7 @@ include $(DEPTH)/config/autoconf.mk
DIRS = base net xml xpath xslt
ifdef TX_EXE
ifndef MOZ_XSL
DIRS += main
endif

View File

@@ -23,11 +23,11 @@
* Bob Miller, kbob@oblix.com
* -- plugged core leak.
*
* $Id: List.cpp,v 1.7 2001-06-10 11:30:24 axel%pike.org Exp $
* $Id: List.cpp,v 1.8 2001-06-10 13:50:46 axel%pike.org Exp $
*/
#include "List.h"
#ifdef TX_EXE
#ifndef MOZ_XSL
#include <iostream.h>
#endif
@@ -38,7 +38,7 @@
/**
* Default constructor for a List;
* @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
* @version $Revision: 1.7 $ $Date: 2001-06-10 11:30:24 $
* @version $Revision: 1.8 $ $Date: 2001-06-10 13:50:46 $
**/
List::List() {

View File

@@ -26,7 +26,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifndef TX_EXE
ifdef MOZ_XSL
MODULE = transformiix
REQUIRES = string xpcom
endif
@@ -45,11 +45,11 @@ CPPSRCS = ArrayList.cpp \
StringList.cpp \
Tokenizer.cpp
ifdef TX_EXE
ifdef MOZ_XSL
CPPSRCS += MozillaString.cpp
else
CPPSRCS += CommandLineUtils.cpp \
TxString.cpp
else
CPPSRCS += MozillaString.cpp
endif
include $(topsrcdir)/config/rules.mk

View File

@@ -35,7 +35,7 @@
#include <stdlib.h>
#include <string.h>
#include "TxString.h"
#ifdef TX_EXE
#ifndef MOZ_XSL
#include <iostream.h>
#endif

View File

@@ -23,16 +23,16 @@
* Bob Miller, kbob@oblix.com
* -- plugged core leak.
*
* $Id: StringList.cpp,v 1.7 2001-06-10 11:30:25 axel%pike.org Exp $
* $Id: StringList.cpp,v 1.8 2001-06-10 13:50:46 axel%pike.org Exp $
*/
/**
* StringList
* @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
* @version $Revision: 1.7 $ $Date: 2001-06-10 11:30:25 $
* @version $Revision: 1.8 $ $Date: 2001-06-10 13:50:46 $
**/
#ifdef TX_EXE
#ifndef MOZ_XSL
#include <iostream.h>
#endif
#include "StringList.h"

View File

@@ -32,11 +32,11 @@
#include "baseutils.h"
#include <iostream.h>
#ifdef TX_EXE
typedef unsigned short UNICODE_CHAR;
#else
#ifdef MOZ_XSL
#include "nsString.h"
typedef PRUnichar UNICODE_CHAR;
#else
typedef unsigned short UNICODE_CHAR;
#endif
#ifndef NULL
@@ -57,7 +57,7 @@ class String : public TxObject
String(const char* source); //Create a string from the characters
String(const UNICODE_CHAR* source);
String(const UNICODE_CHAR* source, Int32 length);
#ifndef TX_EXE
#ifdef MOZ_XSL
String(nsString* theNSString);
#endif
@@ -121,7 +121,7 @@ class String : public TxObject
virtual MBool isEqual(const String& data) const; //Check equality between
//strings
#ifndef TX_EXE
#ifdef MOZ_XSL
virtual MBool isEqualIgnoreCase(const String& data) const;
#endif
@@ -173,7 +173,7 @@ class String : public TxObject
virtual void reverse(); //Reverse the string
#ifndef TX_EXE
#ifdef MOZ_XSL
virtual nsString& getNSString();
virtual const nsString& getConstNSString() const;
#endif
@@ -187,7 +187,7 @@ class String : public TxObject
Int32 UnicodeLength(const UNICODE_CHAR* data);
private:
#ifndef TX_EXE
#ifdef MOZ_XSL
nsString* ptrNSString;
#else
Int32 strLength;

View File

@@ -22,8 +22,8 @@
DEPTH=..\..\..\..
include <$(DEPTH)/config/config.mak>
!if defined(TX_EXE)
DEFINES= $(DEFINES) -DTX_EXE
!if defined(MOZ_XSL)
DEFINES= $(DEFINES) -DMOZ_XSL
!endif
CPPSRCS= \
@@ -41,7 +41,7 @@ CPPSRCS= \
StringList.cpp \
Tokenizer.cpp
!ifndef TX_EXE
!ifdef MOZ_XSL
CPPSRCS = $(CPPSRCS) \
MozillaString.cpp \
$(NULL)
@@ -67,7 +67,7 @@ CPP_OBJS= \
.\$(OBJDIR)\StringList.obj \
.\$(OBJDIR)\Tokenizer.obj
!ifndef TX_EXE
!ifdef MOZ_XSL
CPP_OBJS = $(CPP_OBJS) \
.\$(OBJDIR)\MozillaString.obj \
$(NULL)

View File

@@ -24,7 +24,7 @@ include <$(DEPTH)/config/config.mak>
DIRS=base net xml xpath xslt
!ifdef TX_EXE
!ifndef MOZ_XSL
DIRS = $(DIRS) main
!endif

View File

@@ -26,7 +26,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifndef TX_EXE
ifdef MOZ_XSL
MODULE = transformiix
REQUIRES = string xpcom necko
endif

View File

@@ -29,12 +29,12 @@
* -- 20000326
* -- added Mozilla integration code
*
* $Id: URIUtils.cpp,v 1.12 2001-06-10 11:30:28 axel%pike.org Exp $
* $Id: URIUtils.cpp,v 1.13 2001-06-10 13:50:48 axel%pike.org Exp $
*/
#include "URIUtils.h"
#ifndef TX_EXE
#ifdef MOZ_XSL
#include "nsIServiceManager.h"
#include "nsIIOService.h"
#include "nsIURL.h"
@@ -46,10 +46,10 @@
* URIUtils
* A set of utilities for handling URIs
* @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
* @version $Revision: 1.12 $ $Date: 2001-06-10 11:30:28 $
* @version $Revision: 1.13 $ $Date: 2001-06-10 13:50:48 $
**/
#ifdef TX_EXE
#ifndef MOZ_XSL
//- Constants -/
const String URIUtils::HTTP_PROTOCOL = "http";
@@ -100,7 +100,7 @@ istream* URIUtils::getInputStream
* @return the document base of the given href
**/
void URIUtils::getDocumentBase(const String& href, String& dest) {
#ifndef TX_EXE
#ifdef MOZ_XSL
String docBase("");
nsCOMPtr<nsIURI> pURL;
nsresult result = NS_OK;
@@ -155,7 +155,7 @@ void URIUtils::getDocumentBase(const String& href, String& dest) {
* The new resolved href will be appended to the given dest String
**/
void URIUtils::resolveHref(const String& href, const String& base, String& dest) {
#ifndef TX_EXE
#ifdef MOZ_XSL
nsCOMPtr<nsIURI> pURL;
nsresult result = NS_OK;
@@ -238,7 +238,7 @@ void URIUtils::getDocumentURI(const String& href, String& docUri) {
docUri = href;
} //-- getFragmentIdentifier
#ifdef TX_EXE
#ifndef MOZ_XSL
istream* URIUtils::openStream(ParsedURI* uri) {
if ( !uri ) return 0;
// check protocol

View File

@@ -31,7 +31,7 @@
* -- 20000326
* -- added Mozilla integration code
*
* $Id: URIUtils.h,v 1.14 2001-06-10 11:30:29 axel%pike.org Exp $
* $Id: URIUtils.h,v 1.15 2001-06-10 13:50:49 axel%pike.org Exp $
*/
#ifndef TRANSFRMX_URIUTILS_H
@@ -39,7 +39,7 @@
#include "TxString.h"
#include "baseutils.h"
#ifdef TX_EXE
#ifndef MOZ_XSL
#include <fstream.h>
#endif
@@ -48,7 +48,7 @@
* A utility class for URI handling
* Not yet finished, only handles file URI at this point
* @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
* @version $Revision: 1.14 $ $Date: 2001-06-10 11:30:29 $
* @version $Revision: 1.15 $ $Date: 2001-06-10 13:50:49 $
*
**/

View File

@@ -22,8 +22,8 @@
DEPTH=..\..\..\..
include <$(DEPTH)/config/config.mak>
!if defined(TX_EXE)
DEFINES= $(DEFINES) -DTX_EXE
!if defined(MOZ_XSL)
DEFINES= $(DEFINES) -DMOZ_XSL
!endif
CPPSRCS= \

View File

@@ -26,13 +26,13 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifndef TX_EXE
ifdef MOZ_XSL
MODULE = transformiix
REQUIRES = string xpcom dom layout widget
endif
DIRS = dom parser util
ifdef TX_EXE
ifndef MOZ_XSL
DIRS += printer
endif

View File

@@ -21,13 +21,13 @@
* Keith Visco
* -- original author.
*
* $Id: XMLDOMUtils.cpp,v 1.14 2001-06-10 11:30:30 axel%pike.org Exp $
* $Id: XMLDOMUtils.cpp,v 1.15 2001-06-10 13:50:50 axel%pike.org Exp $
*/
/**
* XMLDOMUtils
* @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
* @version $Revision: 1.14 $ $Date: 2001-06-10 11:30:30 $
* @version $Revision: 1.15 $ $Date: 2001-06-10 13:50:50 $
**/
#include "XMLDOMUtils.h"
@@ -63,7 +63,7 @@ Node* XMLDOMUtils::copyNode(Node* node, Document* owner, NamespaceResolver* reso
Document* newDoc = new Document();
if (!newDoc)
break;
#ifndef TX_EXE
#ifdef MOZ_XSL
owner->addWrapper(newDoc);
#endif
NodeList* nl = doc->getChildNodes();
@@ -86,7 +86,7 @@ Node* XMLDOMUtils::copyNode(Node* node, Document* owner, NamespaceResolver* reso
case Node::ELEMENT_NODE :
{
Element* element = (Element*)node;
#ifndef TX_EXE
#ifdef MOZ_XSL
String name, nameSpaceURI;
name = element->getNodeName();
resolver->getResultNameSpaceURI(name, nameSpaceURI);
@@ -100,7 +100,7 @@ Node* XMLDOMUtils::copyNode(Node* node, Document* owner, NamespaceResolver* reso
if ( attList ) {
for ( i = 0; i < attList->getLength(); i++ ) {
Attr* attr = (Attr*) attList->item(i);
#ifndef TX_EXE
#ifdef MOZ_XSL
resolver->getResultNameSpaceURI(attr->getName(), nameSpaceURI);
newElement->setAttributeNS(nameSpaceURI, attr->getName(), attr->getValue());
#else

View File

@@ -26,7 +26,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifndef TX_EXE
ifdef MOZ_XSL
DIRS = mozImpl
else
DIRS = standalone

View File

@@ -16,13 +16,13 @@
* Peter Van der Beken
* -- original author
*
* $Id: dom.h,v 1.10 2001-06-10 11:30:32 axel%pike.org Exp $
* $Id: dom.h,v 1.11 2001-06-10 13:50:52 axel%pike.org Exp $
*/
#ifndef __TX_DOM_WRAPPER__
#define __TX_DOM_WRAPPER__
#ifdef TX_EXE
#ifndef MOZ_XSL
#include "standalone/dom.h"
#else
#include "mozImpl/mozilladom.h"

View File

@@ -22,7 +22,7 @@
DEPTH=..\..\..\..\..
include <$(DEPTH)/config/config.mak>
!ifndef TX_EXE
!ifdef MOZ_XSL
DIRS = mozImpl
!else
DIRS = standalone

View File

@@ -26,8 +26,10 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifdef MOZ_XSL
MODULE = transformiix
REQUIRES = string xpcom dom layout widget necko
endif
CPPSRCS = MozillaAttr.cpp \
MozillaCDATASection.cpp \

View File

@@ -22,6 +22,10 @@
DEPTH=..\..\..\..\..\..
include <$(DEPTH)/config/config.mak>
!ifdef MOZ_XSL
DEFINES=$(DEFINES) -DMOZ_XSL
!endif
CPPSRCS= \
MozillaAttr.cpp \
MozillaCDATASection.cpp \

View File

@@ -22,7 +22,9 @@
DEPTH=..\..\..\..\..\..
include <$(DEPTH)/config/config.mak>
DEFINES=$(DEFINES) -DTX_EXE
!ifdef MOZ_XSL
DEFINES=$(DEFINES) -DMOZ_XSL
!endif
CPPSRCS=Attr.cpp \
CDATASection.cpp \

View File

@@ -24,10 +24,10 @@ include <$(DEPTH)/config/config.mak>
DIRS=dom parser util
!if defined(TX_EXE)
DIRS = $(DIRS) printer
!if defined(MOZ_XSL)
DEFINES=$(DEFINES) -DMOZ_XSL
!else
DEFINES=$(DEFINES) -DTX_EXE
DIRS = $(DIRS) printer
!endif
CPPSRCS= \

View File

@@ -26,13 +26,13 @@ VPATH = @srcdir@ @srcdir@/xmltok @srcdir@/xmlparse
include $(DEPTH)/config/autoconf.mk
ifndef TX_EXE
ifdef MOZ_XSL
MODULE = transformiix
REQUIRES = string xpcom necko dom layout widget webbrwsr js docshell webshell gfx2 uriloader locale appshell xpconnect
endif
CPPSRCS = XMLParser.cpp
ifndef TX_EXE
ifdef MOZ_XSL
CPPSRCS += nsSyncLoader.cpp
else
CSRCS = xmltok.c xmlrole.c xmlparse.c hashtable.c
@@ -41,7 +41,7 @@ endif
include $(topsrcdir)/config/rules.mk
INCLUDES += -I$(srcdir)/../../base -I$(srcdir)/../../net -I$(srcdir)/../dom
ifdef TX_EXE
ifndef MOZ_XSL
INCLUDES += -I$(srcdir)/xmlparse
COMPILE_CFLAGS += -DXML_UNICODE -I$(srcdir)/xmltok
endif

View File

@@ -34,11 +34,11 @@
* -- Removed a number of castings of XML_Char to DOM_CHAR since they
* were not working on Windows properly
*
* $Id: XMLParser.cpp,v 1.16 2001-06-10 11:30:37 axel%pike.org Exp $
* $Id: XMLParser.cpp,v 1.17 2001-06-10 13:50:55 axel%pike.org Exp $
*/
#include "XMLParser.h"
#ifndef TX_EXE
#ifdef MOZ_XSL
#include "nsSyncLoader.h"
#include "URIUtils.h"
#include "nsIIOService.h"
@@ -69,7 +69,7 @@
**/
XMLParser::XMLParser()
{
#ifdef TX_EXE
#ifndef MOZ_XSL
errorState = MB_FALSE;
#endif
} //-- XMLParser
@@ -87,7 +87,7 @@ Document* XMLParser::getDocumentFromURI
String documentURL;
URIUtils::resolveHref(href, baseUri, documentURL);
#ifndef TX_EXE
#ifdef MOZ_XSL
nsresult rv = NS_OK;
nsCOMPtr<nsIURI> documentURI;
nsCOMPtr<nsIIOService> pService(do_GetService(NS_IOSERVICE_CONTRACTID,
@@ -123,7 +123,7 @@ Document* XMLParser::getDocumentFromURI
}
#ifdef TX_EXE
#ifndef MOZ_XSL
/**
* Parses the given input stream and returns a DOM Document.
* A NULL pointer will be returned if errors occurred

View File

@@ -23,7 +23,7 @@
* Keith Visco
* -- finished implementation
*
* $Id: XMLParser.h,v 1.10 2001-06-10 11:30:37 axel%pike.org Exp $
* $Id: XMLParser.h,v 1.11 2001-06-10 13:50:56 axel%pike.org Exp $
*/
#ifndef MITRE_XMLPARSER_H
@@ -33,7 +33,7 @@
#ifndef XML_UNICODE
#define XML_UNICODE
#endif
#ifdef TX_EXE
#ifndef MOZ_XSL
#include "xmlparse.h"
#include "URIUtils.h"
#endif
@@ -49,11 +49,11 @@ typedef struct {
* parsing is provided by EXPAT.
* @author <a href="tomk@mitre.org">Tom Kneeland</a>
* @author <a href="kvisco@ziplink.net">Keith Visco</a>
* @version $Revision: 1.10 $ $Date: 2001-06-10 11:30:37 $
* @version $Revision: 1.11 $ $Date: 2001-06-10 13:50:56 $
**/
class XMLParser
{
#ifdef TX_EXE
#ifndef MOZ_XSL
/*-----------------6/18/99 12:43PM------------------
* Sax related methods for XML parsers
* --------------------------------------------------*/
@@ -71,7 +71,7 @@ class XMLParser
~XMLParser();
Document* getDocumentFromURI(const String& href, const String& baseUri, String& errMsg);
#ifdef TX_EXE
#ifndef MOZ_XSL
Document* parse(istream& inputStream, const String& uri);
const String& getErrorString();
@@ -84,7 +84,7 @@ class XMLParser
#endif
};
#ifdef TX_EXE
#ifndef MOZ_XSL
/*-----------------6/18/99 12:43PM------------------
* Sax related methods for XML parsers
* --------------------------------------------------*/

View File

@@ -22,7 +22,9 @@
DEPTH=..\..\..\..\..
include <$(DEPTH)/config/config.mak>
!ifndef TX_EXE
!ifdef MOZ_XSL
DEFINES=$(DEFINES) -DMOZ_XSL
CPPSRCS= \
nsSyncLoader.cpp \
XMLParser.cpp \
@@ -33,8 +35,6 @@ CPP_OBJS= \
.\$(OBJDIR)\XMLParser.obj \
$(NULL)
!else
DEFINES=$(DEFINES) -DTX_EXE
CPPSRCS= \
XMLParser.cpp \
$(NULL)
@@ -48,7 +48,7 @@ EXPORTS = \
$(NULL)
LINCS=-I..\..\base -I..\dom -I..\..\net
!ifndef TX_EXE
!ifdef MOZ_XSL
LINCS=$(LINCS) -I$(PUBLIC)\expat
!else
LINCS=$(LINCS) -Ixmlparse

View File

@@ -22,8 +22,8 @@
DEPTH=..\..\..\..\..
include <$(DEPTH)/config/config.mak>
!if defined(TX_EXE)
DEFINES=$(DEFINES) -DTX_EXE
!if defined(MOZ_XSL)
DEFINES=$(DEFINES) -DMOZ_XSL
!endif
CPPSRCS= \

View File

@@ -19,13 +19,13 @@
* Keith Visco, kvisco@ziplink.net
* -- original author.
*
* $Id: DOMHelper.cpp,v 1.10 2001-06-10 11:30:40 axel%pike.org Exp $
* $Id: DOMHelper.cpp,v 1.11 2001-06-10 13:50:58 axel%pike.org Exp $
*/
/**
* A class used to overcome DOM 1.0 deficiencies
* @author <a href="mailto:kvisco@ziplink.net">Keith Visco</a>
* @version $Revision: 1.10 $ $Date: 2001-06-10 11:30:40 $
* @version $Revision: 1.11 $ $Date: 2001-06-10 13:50:58 $
**/
#include "DOMHelper.h"
@@ -116,7 +116,7 @@ Node* DOMHelper::getParentNode(Node* node) {
if (node->getNodeType() != Node::ATTRIBUTE_NODE)
return node->getParentNode();
#ifndef TX_EXE
#ifdef MOZ_XSL
// XXX temporary fix for 70979
nsCOMPtr<nsIDOMAttr> attr(do_QueryInterface(node->getNSObj()));
nsCOMPtr<nsIDOMElement> tmpParent;

View File

@@ -26,7 +26,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifndef TX_EXE
ifdef MOZ_XSL
MODULE = transformiix
REQUIRES = string xpcom dom layout widget
endif

View File

@@ -22,8 +22,8 @@
DEPTH=..\..\..\..\..
include <$(DEPTH)/config/config.mak>
!if defined(TX_EXE)
DEFINES=$(DEFINES) -DTX_EXE
!if defined(MOZ_XSL)
DEFINES=$(DEFINES) -DMOZ_XSL
!endif
CPPSRCS= \

View File

@@ -26,7 +26,7 @@ VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
ifndef TX_EXE
ifdef MOZ_XSL
MODULE = transformiix
REQUIRES = string xpcom dom layout widget caps js
endif
@@ -65,7 +65,7 @@ CPPSRCS = AdditiveExpr.cpp \
UnionExpr.cpp \
VariableRefExpr.cpp \
XPathNames.cpp
ifndef TX_EXE
ifdef MOZ_XSL
CPPSRCS += XPathProcessor.cpp \
nsNodeSet.cpp
endif
@@ -76,7 +76,7 @@ INCLUDES += -I$(srcdir)/../base -I$(srcdir)/../xml \
-I$(srcdir)/../xml/dom -I$(srcdir)/../xml/util \
-I$(srcdir)/../xslt -I$(srcdir)/../xslt/util \
-I$(srcdir)/../xslt/functions
ifndef TX_EXE
ifdef MOZ_XSL
INCLUDES += -I$(srcdir)
endif

View File

@@ -27,12 +27,12 @@
* Olivier Gerardin, ogerardin@vo.lu
* -- fixed numberValue()
*
* $Id: NodeSet.cpp,v 1.7 2001-06-10 11:30:42 axel%pike.org Exp $
* $Id: NodeSet.cpp,v 1.8 2001-06-10 13:50:59 axel%pike.org Exp $
*/
#include "NodeSet.h"
#include "XMLDOMUtils.h"
#ifdef TX_EXE
#ifndef MOZ_XSL
#include <iostream.h>
#endif
@@ -40,7 +40,7 @@
* NodeSet <BR />
* This class was ported from XSL:P. <BR />
* @author <A HREF="mailto:kvisco@ziplink.net">Keith Visco</A>
* @version $Revision: 1.7 $ $Date: 2001-06-10 11:30:42 $
* @version $Revision: 1.8 $ $Date: 2001-06-10 13:50:59 $
**/