head	1.2;
access;
symbols
	OPENPKG_E1_MP_HEAD:1.2
	OPENPKG_E1_MP:1.2
	OPENPKG_E1_MP_2_STABLE:1.2
	OPENPKG_E1_FP:1.2
	OPENPKG_2_STABLE_20061018:1.2
	OPENPKG_2_STABLE:1.2.0.20
	OPENPKG_2_STABLE_BP:1.2
	OPENPKG_2_5_SOLID:1.2.0.18
	OPENPKG_2_5_SOLID_BP:1.2
	OPENPKG_2_4_RELEASE:1.2
	OPENPKG_2_4_SOLID:1.2.0.16
	OPENPKG_2_4_SOLID_BP:1.2
	OPENPKG_2_3_RELEASE:1.2
	OPENPKG_2_3_SOLID:1.2.0.14
	OPENPKG_2_3_SOLID_BP:1.2
	OPENPKG_2_2_RELEASE:1.2
	OPENPKG_2_2_SOLID:1.2.0.12
	OPENPKG_2_2_SOLID_BP:1.2
	OPENPKG_2_1_RELEASE:1.2
	OPENPKG_2_1_SOLID:1.2.0.10
	OPENPKG_2_1_SOLID_BP:1.2
	OPENPKG_2_0_RELEASE:1.2
	OPENPKG_2_0_SOLID:1.2.0.8
	OPENPKG_2_0_SOLID_BP:1.2
	OPENPKG_1_3_RELEASE:1.2
	OPENPKG_1_3_SOLID:1.2.0.6
	OPENPKG_1_3_SOLID_BP:1.2
	OPENPKG_1_2_SOLID:1.2.0.4
	OPENPKG_1_2_SOLID_BP:1.2
	OPENPKG_1_STABLE:1.2.0.2
	OPENPKG_1_STABLE_BP:1.2
	OPENPKG_0_0:1.1.1.1
	OPENPKG:1.1.1;
locks; strict;
comment	@# @;


1.2
date	2002.01.26.13.48.28;	author rse;	state dead;
branches;
next	1.1;

1.1
date	2001.09.18.09.48.31;	author rse;	state Exp;
branches
	1.1.1.1;
next	;

1.1.1.1
date	2001.09.18.09.48.31;	author rse;	state Exp;
branches;
next	;


desc
@@


1.2
log
@Upgrade to OpenJade 1.3.1
@
text
@--- style/LangObj.cxx.orig	Fri Jul  2 00:49:58 1999
+++ style/LangObj.cxx	Fri Apr 27 10:33:44 2001
@@@@ -12,11 +12,11 @@@@
 #include <string.h>
 #include <ctype.h>
 #include <string.h>
-#include <wchar.h>
-#include <wctype.h>
 
 #ifdef SP_HAVE_LOCALE
 #include <locale.h>
+#include <wchar.h>
+#include <wctype.h>
 #endif
 
 #ifdef DSSSL_NAMESPACE
--- include/config.h.orig	Fri Jul 23 17:50:17 1999
+++ include/config.h	Sun Sep  2 11:34:47 2001
@@@@ -26,7 +26,9 @@@@
 #endif
 #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 8)
 #define SP_ANSI_LIB
+#if __GNUC__ < 3
 #define SP_NO_STD_NAMESPACE
+#endif
 #undef SP_NEW_H_MISSING
 #endif
 
--- spgrove/GroveBuilder.cxx.orig	Sun Oct 17 22:37:42 1999
+++ spgrove/GroveBuilder.cxx	Sun Sep  2 12:28:01 2001
@@@@ -80,11 +80,11 @@@@
 				       const ElementNode *node) const;
   virtual AccessResult setNodePtrFirst(NodePtr &ptr,
 				       const DataNode *node) const;
-  virtual const Chunk *after() const = 0;
+  virtual const struct Chunk *after() const = 0;
   virtual AccessResult getFollowing(const GroveImpl *,
-                                    const Chunk *&, unsigned long &nNodes)
+                                    const struct Chunk *&, unsigned long &nNodes)
     const;
-  virtual AccessResult getFirstSibling(const GroveImpl *, const Chunk *&) const;
+  virtual AccessResult getFirstSibling(const GroveImpl *, const struct Chunk *&) const;
   virtual const StringC *id() const;
   virtual Boolean getLocOrigin(const Origin *&) const;
   ParentChunk *origin;
@@@@ -110,8 +110,8 @@@@
   AccessResult setNodePtrFirst(NodePtr &ptr, const DataNode *node) const;
   AccessResult setNodePtrFirst(NodePtr &ptr, const ElementNode *node) const;
   static const StringC &key(const ElementChunk &chunk) { return *chunk.id(); }
-  const Chunk *after() const;
-  AccessResult getFollowing(const GroveImpl *, const Chunk *&, unsigned long &nNodes)
+  const struct Chunk *after() const;
+  AccessResult getFollowing(const GroveImpl *, const struct Chunk *&, unsigned long &nNodes)
     const;
   const ElementType *elementType() const { return type; }
 private:
@@@@ -133,9 +133,9 @@@@
   AccessResult setNodePtrFirst(NodePtr &ptr, const BaseNode *) const;
   AccessResult setNodePtrFirst(NodePtr &ptr, const ElementNode *node) const;
   AccessResult setNodePtrFirst(NodePtr &ptr, const DataNode *node) const;
-  const Chunk *after() const;
+  const struct Chunk *after() const;
   AccessResult getFollowing(const GroveImpl *,
-                            const Chunk *&, unsigned long &nNodes)
+                            const struct Chunk *&, unsigned long &nNodes)
     const;
   Boolean getLocOrigin(const Origin *&) const;
 private:
@@@@ -389,7 +389,7 @@@@
   // Implemented with double dispatching.
   virtual bool same(const BaseNode &) const = 0;
   // The second half of the dispatch.
-  virtual bool same2(const ChunkNode *) const;
+  virtual bool same2(const struct ChunkNode *) const;
   virtual bool same2(const DataNode *) const;
   virtual bool same2(const AttributeAsgnNode *) const;
   virtual bool same2(const AttributeValueTokenNode *) const;
@@@@ -440,14 +440,14 @@@@
 }
 
 struct ForwardingChunk : Chunk {
-  ForwardingChunk(const Chunk *to, ParentChunk *p)
+  ForwardingChunk(const struct Chunk *to, ParentChunk *p)
     : forwardTo(to) { origin = p; }
   AccessResult setNodePtrFirst(NodePtr &ptr, const BaseNode *node) const;
   AccessResult getFollowing(const GroveImpl *,
-                            const Chunk *&, unsigned long &nNodes)
+                            const struct Chunk *&, unsigned long &nNodes)
     const;
-  const Chunk *after() const { return forwardTo; }
-  const Chunk *forwardTo;
+  const struct Chunk *after() const { return forwardTo; }
+  const struct Chunk *forwardTo;
 };
 
 class ChunkNode : public BaseNode {
@@@@ -455,7 +455,7 @@@@
   ChunkNode(const GroveImpl *grove, const LocChunk *chunk);
   const LocChunk *chunk() const { return chunk_; }
   bool same(const BaseNode &node) const;
-  bool same2(const ChunkNode *node) const;
+  bool same2(const struct ChunkNode *node) const;
   unsigned long hash() const;
   AccessResult getParent(NodePtr &ptr) const;
   AccessResult getTreeRoot(NodePtr &ptr) const;
@@@@ -485,7 +485,7 @@@@
   Chunk *documentElement;
   Chunk *epilog;
   AccessResult setNodePtrFirst(NodePtr &ptr, const BaseNode *node) const;
-  const Chunk *after() const { return this + 1; }
+  const struct Chunk *after() const { return this + 1; }
 };
 
 class SgmlDocumentNode : public ChunkNode, public SdNode {
@@@@ -535,7 +535,7 @@@@
   const AttributeValue *
     attributeValue(size_t attIndex, const GroveImpl &) const;
   Boolean mustOmitEndTag() const;
-  const Chunk *after() const;
+  const struct Chunk *after() const;
   const StringC *id() const;
   size_t nAtts;
 };
@@@@ -585,8 +585,8 @@@@
 
 class CharsChunk : public LocChunk {
 public:
-  const Chunk *after() const {
-    return (const Chunk *)((char *)this + allocSize(size));
+  const struct Chunk *after() const {
+    return (const struct Chunk *)((char *)this + allocSize(size));
   }
   const Char *data() const { return (const Char *)(this + 1); }
   size_t size;
@@@@ -602,7 +602,7 @@@@
   AccessResult setNodePtrFirst(NodePtr &ptr, const BaseNode *node) const;
   AccessResult setNodePtrFirst(NodePtr &ptr, const ElementNode *node) const;
   AccessResult setNodePtrFirst(NodePtr &ptr, const DataNode *node) const;
-  AccessResult getFollowing(const GroveImpl *, const Chunk *&, unsigned long &) const;
+  AccessResult getFollowing(const GroveImpl *, const struct Chunk *&, unsigned long &) const;
 };
 
 class DataNode : public ChunkNode {
@@@@ -646,11 +646,11 @@@@
 };
 
 class PrologPiChunk : public PiChunk {
-  AccessResult getFirstSibling(const GroveImpl *, const Chunk *&) const;
+  AccessResult getFirstSibling(const GroveImpl *, const struct Chunk *&) const;
 };
 
 class EpilogPiChunk : public PiChunk {
-  AccessResult getFirstSibling(const GroveImpl *, const Chunk *&) const;
+  AccessResult getFirstSibling(const GroveImpl *, const struct Chunk *&) const;
 };
 
 class PiNode : public ChunkNode {
@@@@ -672,7 +672,7 @@@@
 class EntityRefChunk : public LocChunk {
 public:
   const Entity *entity;
-  const Chunk *after() const { return this + 1; }
+  const struct Chunk *after() const { return this + 1; }
 };
 
 class EntityRefNode : public ChunkNode {
@@@@ -713,7 +713,7 @@@@
 public:
   Char c;
   AccessResult setNodePtrFirst(NodePtr &ptr, const BaseNode *node) const;
-  const Chunk *after() const { return this + 1; }
+  const struct Chunk *after() const { return this + 1; }
 };
 
 class NonSgmlNode : public ChunkNode {
@@@@ -1676,12 +1676,12 @@@@
 class ElementsNodeList : public BaseNodeList {
 public:
   ElementsNodeList(const GroveImpl *grove,
-                   const Chunk *head);
+                   const struct Chunk *head);
   AccessResult first(NodePtr &) const;
   AccessResult chunkRest(NodeListPtr &) const;
 public:
   GroveImplPtr grove_;
-  const Chunk *first_;
+  const struct Chunk *first_;
 };
 
 class EntitiesNodeList : public BaseNodeList {
@@@@ -1960,7 +1960,7 @@@@
   completeLimit_ = freePtr_;
   // Allow for the possibility of invalid documents with elements
   // after the document element.
-  if ((const Chunk *)chunk->origin == root_ && root_->documentElement == 0)
+  if ((const struct Chunk *)chunk->origin == root_ && root_->documentElement == 0)
     root_->documentElement = chunk;
   else if (tailPtr_) {
     *tailPtr_ = chunk;
@@@@ -1987,7 +1987,7 @@@@
   }
   tailPtr_ = &origin_->nextSibling;
   origin_ = origin_->origin;
-  if ((const Chunk *)origin_ == root_)
+  if ((const struct Chunk *)origin_ == root_)
     finishDocumentElement();
   maybePulse();
 }
@@@@ -1995,7 +1995,7 @@@@
 inline
 Boolean GroveImpl::haveRootOrigin()
 {
-  return (const Chunk *)origin_ == root_;
+  return (const struct Chunk *)origin_ == root_;
 }
 
 inline
@@@@ -2090,7 +2090,7 @@@@
 {
   // The forwarding chunk has origin = 0, so it will stop
   // the iteration before after() can return 0.
-  const Chunk *p = chunk_->after();
+  const struct Chunk *p = chunk_->after();
   while (p == grove()->completeLimit())
     if (!grove()->waitForMoreNodes())
       return accessTimeout;
@@@@ -2476,7 +2476,7 @@@@
   char *chunkStart = (char *)(*blockTailPtr_ + 1);
   blockTailPtr_ = &(*blockTailPtr_)->next;
   if (freePtr_)
-    (void)new (freePtr_) ForwardingChunk((const Chunk *)chunkStart, origin_);
+    (void)new (freePtr_) ForwardingChunk((const struct Chunk *)chunkStart, origin_);
   freePtr_ = chunkStart + n;
   return chunkStart;
 }
@@@@ -2484,7 +2484,7 @@@@
 AccessResult ChunkNode::getLocation(Location &loc) const
 {
   const Origin *origin = grove()->currentLocOrigin();
-  for (const Chunk *p = chunk_->after(); p; p = p->after()) {
+  for (const struct Chunk *p = chunk_->after(); p; p = p->after()) {
     if (p == grove()->completeLimitWithLocChunkAfter()) {
       while (!p->getLocOrigin(origin)) {
 	p = p->after();
@@@@ -2920,7 +2920,7 @@@@
   while (!chunk()->nextSibling) {
     if (!grove()->maybeMoreSiblings(chunk())) {
       // Allow for the possibility of invalid documents with elements in the epilog.
-      if ((const Chunk *)chunk() == grove()->root()->documentElement)
+      if ((const struct Chunk *)chunk() == grove()->root()->documentElement)
 	return accessNotInClass;
       else
         return accessNull;
@@@@ -2936,7 +2936,7 @@@@
 
 AccessResult ElementNode::nextChunkAfter(NodePtr &nd) const
 {
-  const Chunk *p = chunk_->after();
+  const struct Chunk *p = chunk_->after();
   while (p == grove()->completeLimit())
     if (!grove()->waitForMoreNodes())
       return accessTimeout;
@@@@ -2944,12 +2944,12 @@@@
 }
 
 AccessResult ElementChunk::getFollowing(const GroveImpl *grove,
-					const Chunk *&f,
+					const struct Chunk *&f,
 					unsigned long &n) const
 {
   while (!nextSibling) {
     if (!grove->maybeMoreSiblings(this)) {
-      if ((const Chunk *)origin == grove->root())
+      if ((const struct Chunk *)origin == grove->root())
 	return accessNotInClass;
       else
         return accessNull;
@@@@ -2964,12 +2964,12 @@@@
 
 AccessResult ElementNode::firstChild(NodePtr &ptr) const
 {
-  const Chunk *p = chunk()->after();
+  const struct Chunk *p = chunk()->after();
   while (p == grove()->completeLimit()) {
     if (!grove()->waitForMoreNodes())
       return accessTimeout;
   }
-  if ((const Chunk *)(p->origin) == chunk())
+  if ((const struct Chunk *)(p->origin) == chunk())
     return p->setNodePtrFirst(ptr, this);
   return accessNull;
 }
@@@@ -3099,9 +3099,9 @@@@
   return chunk;
 }
 
-const Chunk *AttElementChunk::after() const
+const struct Chunk *AttElementChunk::after() const
 {
-  return (const Chunk *)((char *)(this + 1)
+  return (const struct Chunk *)((char *)(this + 1)
 			 + (sizeof(const AttributeValue *) * nAtts));
 }
 
@@@@ -3141,7 +3141,7 @@@@
   return 0;
 }
 
-const Chunk *ElementChunk::after() const
+const struct Chunk *ElementChunk::after() const
 {
   return this + 1;
 }
@@@@ -3331,7 +3331,7 @@@@
 
 AccessResult DataNode::nextChunkAfter(NodePtr &nd) const
 {
-  const Chunk *p = chunk_->after();
+  const struct Chunk *p = chunk_->after();
   while (p == grove()->completeLimit())
     if (!grove()->waitForMoreNodes())
       return accessTimeout;
@@@@ -3367,13 +3367,13 @@@@
 }
 
 AccessResult DataChunk::getFollowing(const GroveImpl *grove,
-				     const Chunk *&f,
+				     const struct Chunk *&f,
 				     unsigned long &i) const
 {
   // We could call Chunk::getFollowing to do most of
   // the work, but that would cost us a couple of extra
   // virtual function calls.
-  const Chunk *p = CharsChunk::after();
+  const struct Chunk *p = CharsChunk::after();
   while (p == grove->completeLimit())
     if (!grove->waitForMoreNodes())
       return accessTimeout;
@@@@ -3446,13 +3446,13 @@@@
   return accessOK;
 }
 
-AccessResult PrologPiChunk::getFirstSibling(const GroveImpl *grove, const Chunk *&p) const
+AccessResult PrologPiChunk::getFirstSibling(const GroveImpl *grove, const struct Chunk *&p) const
 {
   p = grove->root()->prolog;
   return accessOK;
 }
 
-AccessResult EpilogPiChunk::getFirstSibling(const GroveImpl *grove, const Chunk *&p) const
+AccessResult EpilogPiChunk::getFirstSibling(const GroveImpl *grove, const struct Chunk *&p) const
 {
   p = grove->root()->epilog;
   return accessOK;
@@@@ -3599,7 +3599,7 @@@@
 {
   // The forwarding chunk has origin = 0, so it will stop
   // the iteration before after() can return 0.
-  const Chunk *p = chunk_->after();
+  const struct Chunk *p = chunk_->after();
   while (p == grove()->completeLimit())
     if (!grove()->waitForMoreNodes())
       return accessTimeout;
@@@@ -3610,7 +3610,7 @@@@
 
 AccessResult ChunkNode::nextChunkAfter(NodePtr &nd) const
 {
-  const Chunk *p = chunk_->after();
+  const struct Chunk *p = chunk_->after();
   while (p == grove()->completeLimit())
     if (!grove()->waitForMoreNodes())
       return accessTimeout;
@@@@ -3619,7 +3619,7 @@@@
 
 AccessResult ChunkNode::firstSibling(NodePtr &ptr) const
 {
-  const Chunk *first;
+  const struct Chunk *first;
   AccessResult ret = chunk_->getFirstSibling(grove(), first);
   if (ret != accessOK)
     return ret;
@@@@ -3628,7 +3628,7 @@@@
 
 AccessResult ChunkNode::siblingsIndex(unsigned long &i) const
 {
-  const Chunk *p;
+  const struct Chunk *p;
   AccessResult ret = chunk_->getFirstSibling(grove(), p);
   if (ret != accessOK)
     return ret;
@@@@ -3644,13 +3644,13 @@@@
 
 AccessResult ChunkNode::followSiblingRef(unsigned long i, NodePtr &ptr) const
 {
-  const Chunk *p;
+  const struct Chunk *p;
   unsigned long count;
   AccessResult ret = chunk()->getFollowing(grove(), p, count);
   if (ret != accessOK)
     return ret;
   while (i > 0) {
-    const Chunk *lastP = p;
+    const struct Chunk *lastP = p;
     ret = p->getFollowing(grove(), p, count);
     if (ret == accessOK && count <= i)
       i -= count;
@@@@ -4659,14 +4659,14 @@@@
 }
 
 ElementsNodeList::ElementsNodeList(const GroveImpl *grove,
-				   const Chunk *first)
+				   const struct Chunk *first)
 : grove_(grove), first_(first)
 {
 }
 
 AccessResult ElementsNodeList::first(NodePtr &ptr) const
 {
-  const Chunk *p = first_;
+  const struct Chunk *p = first_;
   while (p) {
     while (p == grove_->completeLimit()) {
       if (!grove_->waitForMoreNodes())
@@@@ -4684,7 +4684,7 @@@@
 
 AccessResult ElementsNodeList::chunkRest(NodeListPtr &ptr) const
 {
-  const Chunk *p = first_;
+  const struct Chunk *p = first_;
   while (p) {
     while (p == grove_->completeLimit()) {
       if (!grove_->waitForMoreNodes())
@@@@ -4982,7 +4982,7 @@@@
   // This is needed because PiNodes in the prolog and
   // epilog don't have a parent but do have an origin.
   // Also for the document element.
-  if ((const Chunk *)chunk()->origin == grove()->root())
+  if ((const struct Chunk *)chunk()->origin == grove()->root())
     return accessNull;
   chunk_->origin->setNodePtrFirst(ptr, this);
   return accessOK;
@@@@ -4991,7 +4991,7 @@@@
 AccessResult ChunkNode::getTreeRoot(NodePtr &ptr) const
 {
   if (chunk()->origin
-      && (const Chunk *)chunk()->origin != grove()->root()
+      && (const struct Chunk *)chunk()->origin != grove()->root()
       // With invalid documents we might have elements in the epilog
       && !grove()->root()->epilog
       && grove()->root()->documentElement)
@@@@ -5009,12 +5009,12 @@@@
 
 AccessResult ChunkNode::getOriginToSubnodeRelPropertyName(ComponentName::Id &name) const
 {
-  if ((const Chunk *)chunk()->origin != grove()->root())
+  if ((const struct Chunk *)chunk()->origin != grove()->root())
     name = ComponentName::idContent;
-  else if ((const Chunk *)chunk() == grove()->root()->documentElement)
+  else if ((const struct Chunk *)chunk() == grove()->root()->documentElement)
     name = ComponentName::idDocumentElement;
   else {
-    const Chunk *tem;
+    const struct Chunk *tem;
     if (chunk()->getFirstSibling(grove(), tem) == accessOK && tem == grove()->root()->prolog)
       name = ComponentName::idProlog;
     else
@@@@ -5033,7 +5033,7 @@@@
   return node.same2(this);
 }
 
-bool ChunkNode::same2(const ChunkNode *node) const
+bool ChunkNode::same2(const struct ChunkNode *node) const
 {
   return chunk_ == node->chunk_;
 }
@@@@ -5083,7 +5083,7 @@@@
   return 0;
 }
 
-bool BaseNode::same2(const ChunkNode *) const
+bool BaseNode::same2(const struct ChunkNode *) const
 {
   return 0;
 }
@@@@ -5246,7 +5246,7 @@@@
 
 AccessResult
 ForwardingChunk::getFollowing(const GroveImpl *grove,
-                              const Chunk *&p, unsigned long &nNodes)
+                              const struct Chunk *&p, unsigned long &nNodes)
     const
 {
   AccessResult ret = Chunk::getFollowing(grove, p, nNodes);
@@@@ -5257,7 +5257,7 @@@@
 
 AccessResult
 LocOriginChunk::getFollowing(const GroveImpl *grove,
-                             const Chunk *&p, unsigned long &nNodes)
+                             const struct Chunk *&p, unsigned long &nNodes)
     const
 {
   AccessResult ret = Chunk::getFollowing(grove, p, nNodes);
@@@@ -5268,20 +5268,20 @@@@
 
 AccessResult LocOriginChunk::setNodePtrFirst(NodePtr &ptr, const BaseNode *node) const
 {
-  return ((const Chunk *)(this + 1))->setNodePtrFirst(ptr, node);
+  return ((const struct Chunk *)(this + 1))->setNodePtrFirst(ptr, node);
 }
 
 AccessResult LocOriginChunk::setNodePtrFirst(NodePtr &ptr, const ElementNode *node) const
 {
-  return ((const Chunk *)(this + 1))->setNodePtrFirst(ptr, node);
+  return ((const struct Chunk *)(this + 1))->setNodePtrFirst(ptr, node);
 }
 
 AccessResult LocOriginChunk::setNodePtrFirst(NodePtr &ptr, const DataNode *node) const
 {
-  return ((const Chunk *)(this + 1))->setNodePtrFirst(ptr, node);
+  return ((const struct Chunk *)(this + 1))->setNodePtrFirst(ptr, node);
 }
 
-const Chunk *LocOriginChunk::after() const
+const struct Chunk *LocOriginChunk::after() const
 {
   return this + 1;
 }
@@@@ -5310,9 +5310,9 @@@@
 }
 
 AccessResult Chunk::getFollowing(const GroveImpl *grove,
-			         const Chunk *&f, unsigned long &n) const
+			         const struct Chunk *&f, unsigned long &n) const
 {
-  const Chunk *p = after();
+  const struct Chunk *p = after();
   while (p == grove->completeLimit())
     if (!grove->waitForMoreNodes())
       return accessTimeout;
@@@@ -5324,9 +5324,9 @@@@
 }
 
 AccessResult Chunk::getFirstSibling(const GroveImpl *grove,
-				    const Chunk *&p) const
+				    const struct Chunk *&p) const
 {
-  if ((const Chunk *)origin == grove->root())
+  if ((const struct Chunk *)origin == grove->root())
     return accessNotInClass;
   p = origin->after();
   return accessOK;
@


1.1
log
@Initial revision
@
text
@@


1.1.1.1
log
@Import OpenPKG sources into CVS repository

@
text
@@