You are viewing a plain text version of this content. The canonical link for it is here.
Posted to embperl-cvs@perl.apache.org by ri...@locus.apache.org on 2000/12/17 11:24:50 UTC
cvs commit: embperl Embperl.pm epcomp.c epdom.c
richter 00/12/17 02:24:50
Modified: . Tag: Embperl2c Embperl.pm epcomp.c epdom.c
Log:
Embperl 2
Revision Changes Path
No revision
No revision
1.118.4.17 +2 -2 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.118.4.16
retrieving revision 1.118.4.17
diff -u -r1.118.4.16 -r1.118.4.17
--- Embperl.pm 2000/12/04 13:38:13 1.118.4.16
+++ Embperl.pm 2000/12/17 10:24:48 1.118.4.17
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Embperl.pm,v 1.118.4.16 2000/12/04 13:38:13 richter Exp $
+# $Id: Embperl.pm,v 1.118.4.17 2000/12/17 10:24:48 richter Exp $
#
###################################################################################
@@ -1225,7 +1225,7 @@
sub cleanup
{
- return 0 ;
+ ####return 0 ;
#log_svs ("cleanup entry") ;
my $glob ;
1.4.2.26 +2 -1 embperl/Attic/epcomp.c
Index: epcomp.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcomp.c,v
retrieving revision 1.4.2.25
retrieving revision 1.4.2.26
diff -u -r1.4.2.25 -r1.4.2.26
--- epcomp.c 2000/12/15 15:08:27 1.4.2.25
+++ epcomp.c 2000/12/17 10:24:49 1.4.2.26
@@ -1588,7 +1588,8 @@
nOrderNdx = SvIV (* av_fetch (pSaveAV, 2, 0)) ;
pCallerDomTree = DomTree_self (r -> xCurrDomTree) ;
- xDocFraq = Node_replaceChildWithNode (pSubDomTree, pSubDomTree -> xDocument, pCallerDomTree, r -> xCurrNode) ;
+ //xDocFraq = Node_replaceChildWithNode (pSubDomTree, pSubDomTree -> xDocument, pCallerDomTree, r -> xCurrNode) ;
+ xDocFraq = Node_insertAfter (pSubDomTree, pSubDomTree -> xDocument, pCallerDomTree, r -> xCurrNode) ;
/* Element_selfSetAttribut (pCallerDomTree, Node_self (pCallerDomTree, xDocFraq), NULL, xOrderIndexAttr, NULL, nOrderNdx, 0) ; */
1.4.2.18 +14 -6 embperl/Attic/epdom.c
Index: epdom.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.c,v
retrieving revision 1.4.2.17
retrieving revision 1.4.2.18
diff -u -r1.4.2.17 -r1.4.2.18
--- epdom.c 2000/12/15 15:08:28 1.4.2.17
+++ epdom.c 2000/12/17 10:24:49 1.4.2.18
@@ -1611,7 +1611,8 @@
tNodeData * pNewNode = Node_self (pNewNodeDomTree, xNewNode) ;
tNodeData * pRefNode = Node_self (pRefNodeDomTree, xRefNode) ;
tNodeData * pNxtNode = Node_selfNextSibling (pRefNodeDomTree, pRefNode) ;
-
+ tNode xOrgNode ;
+
if (pNewNodeDomTree != pRefNodeDomTree)
{
@@ -1620,7 +1621,7 @@
pNew -> nText = pNewNode -> nText ;
pNew -> xChilds = pNewNode -> xChilds ;
pNew -> nType = pNewNode -> nType ;
- pNew -> bFlags = pNewNode -> bFlags ;
+ pNew -> bFlags = pNewNode -> bFlags | nflgModified | nflgReturn ;
if (pNew -> nText)
NdxStringRefcntInc (pNew -> nText) ;
@@ -1633,11 +1634,18 @@
else
pNxtNode = pRefNode ;
+ if ((pNxtNode -> bFlags & nflgModified) == 0)
+ {
+ xOrgNode = pNewNode -> xNdx ;
+ pNxtNode -> xPrev = pNewNode -> xNdx ;
+ pRefNode -> xNext = pNewNode -> xNdx ;
+ pNewNode -> xPrev = pRefNode -> xNdx ;
+ pNewNode -> xNext = pNxtNode -> xNdx ;
+ }
+ else
+ xOrgNode = pNxtNode -> xNdx ;
- pNxtNode -> xPrev = pNewNode -> xNdx ;
- pRefNode -> xNext = pNewNode -> xNdx ;
- pNewNode -> xPrev = pRefNode -> xNdx ;
- pNewNode -> xNext = pNxtNode -> xNdx ;
+ DomTree_selfCheckpoint (pRefNodeDomTree, xOrgNode, pNewNode -> xNdx) ;
if (pNewNode -> nType == ntypDocumentFraq)
{