richter 01/11/12 06:43:19
Modified: . Tag: Embperl2c epcomp.c epdom.c epnames.h
Log:
EMbperl 2
Revision Changes Path
No revision
No revision
1.4.2.74 +14 -4 embperl/Attic/epcomp.c
Index: epcomp.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcomp.c,v
retrieving revision 1.4.2.73
retrieving revision 1.4.2.74
diff -u -r1.4.2.73 -r1.4.2.74
--- epcomp.c 2001/11/12 12:45:39 1.4.2.73
+++ epcomp.c 2001/11/12 14:43:18 1.4.2.74
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epcomp.c,v 1.4.2.73 2001/11/12 12:45:39 richter Exp $
+# $Id: epcomp.c,v 1.4.2.74 2001/11/12 14:43:18 richter Exp $
#
###################################################################################*/
@@ -1335,6 +1335,7 @@
int nCheckpointCodeOffset = 0 ;
int nCheckpointArrayOffset = 0 ;
tEmbperlCompilerInfo * pInfo = (tEmbperlCompilerInfo *)(*(void * *)r ->
pTokenTable) ;
+ tIndex xDomTree = pDomTree -> xNdx ;
pCmd = NULL ;
@@ -1400,6 +1401,7 @@
while (pChild)
{
embperl_CompileNode (r, pDomTree, pChild -> xNdx,
bCheckpointPending) ;
+ pDomTree = DomTree_self (xDomTree) ; /* addr may have changed */
pNext = Node_selfNextSibling (pDomTree, pChild, 0) ;
if (pChild -> bFlags == 0)
Node_selfRemoveChild(pDomTree, -1, pChild) ;
@@ -1415,7 +1417,8 @@
{
if ((rc = embperl_CompileCmd (r, pDomTree, pNode, pCmd, &nStartCodeOffset)) !=
ok)
return rc ;
- pCmd = pCmd -> pNext ;
+ pDomTree = DomTree_self (xDomTree) ; /* addr may have changed */
+ pCmd = pCmd -> pNext ;
}
pCmd = pCmdHead ;
@@ -1435,6 +1438,7 @@
if ((rc = embperl_CompileNode (r, pDomTree, xChildNode,
bCheckpointPending)) != ok)
return rc ;
+ pDomTree = DomTree_self (xDomTree) ; /* addr may have changed */
pChildNode = Node_self (pDomTree, xChildNode) ;
xChildNode = Node_nextSibling (pDomTree, xChildNode, 0) ;
if (pChildNode -> bFlags == 0)
@@ -1480,6 +1484,7 @@
{
int rc ;
int bCheckpointPending = 0 ;
+ tIndex xDomTree = pDomTree -> xNdx ;
pDomTree -> xCurrNode = 0 ;
@@ -1487,6 +1492,8 @@
if ((rc = embperl_CompileNode (r, pDomTree, pDomTree -> xDocument,
&bCheckpointPending)) != ok)
return rc ;
+ pDomTree = DomTree_self (xDomTree) ; /* addr may have changed */
+
if (bCheckpointPending)
{
int l ;
@@ -1537,6 +1544,9 @@
else if (nStep > 4096)
nStep = 4096 ;
+ if (r -> bDebug & dbgCompile)
+ lprintf (r, "[%d]EPCOMP: Start compiling %s DomTree = %d\n", r -> nPid, r ->
Buf.pFile -> sSourcefile, xDomTree) ;
+
r -> nPhase = phCompile ;
r -> pProgRun = NULL ;
@@ -1571,7 +1581,7 @@
ArrayFree (&pDomTree -> pCheckpoints) ;
pDomTree = DomTree_self (xDomTree) ;
- DomTree_Delete (pDomTree) ;
+ DomTree_delete (pDomTree) ;
*pxResultDomTree = 0 ;
return rc ;
@@ -1646,7 +1656,7 @@
{
pDomTree = DomTree_self (xDomTree) ;
if (pDomTree)
- DomTree_Delete (pDomTree) ;
+ DomTree_delete (pDomTree) ;
*pxResultDomTree = 0 ;
}
1.4.2.72 +5 -5 embperl/Attic/epdom.c
Index: epdom.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.c,v
retrieving revision 1.4.2.71
retrieving revision 1.4.2.72
diff -u -r1.4.2.71 -r1.4.2.72
--- epdom.c 2001/11/12 12:45:39 1.4.2.71
+++ epdom.c 2001/11/12 14:43:18 1.4.2.72
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epdom.c,v 1.4.2.71 2001/11/12 12:45:39 richter Exp $
+# $Id: epdom.c,v 1.4.2.72 2001/11/12 14:43:18 richter Exp $
#
###################################################################################*/
@@ -1024,9 +1024,8 @@
if (pNode -> nText)
NdxStringFree (pNode -> nText) ;
- dom_free (pNode, &numNodes) ;
-
- if (pLookupLevelNode = pLookup -> pLookupLevel)
+
+ if ((pLookupLevelNode = pLookup -> pLookupLevel) && pLookupLevelNode ->
xNullNode == pNode -> xNdx)
{
pLookupLevelNodeLevel = pLookupLevelNode -> items ;
n = pLookupLevelNode -> numItems ;
@@ -1046,7 +1045,8 @@
dom_free_size (pLookupLevelNode, sizeof (tRepeatLevelLookup) + sizeof
(tRepeatLevelLookupItem) * pLookupLevelNode -> numItems, &numLevelLookup) ;
}
- }
+ dom_free (pNode, &numNodes) ;
+ }
pLookup-- ;
}
1.19.4.13 +2 -2 embperl/epnames.h
Index: epnames.h
===================================================================
RCS file: /home/cvs/embperl/epnames.h,v
retrieving revision 1.19.4.12
retrieving revision 1.19.4.13
diff -u -r1.19.4.12 -r1.19.4.13
--- epnames.h 2001/11/12 12:45:40 1.19.4.12
+++ epnames.h 2001/11/12 14:43:19 1.19.4.13
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epnames.h,v 1.19.4.12 2001/11/12 12:45:40 richter Exp $
+# $Id: epnames.h,v 1.19.4.13 2001/11/12 14:43:19 richter Exp $
#
###################################################################################*/
@@ -354,7 +354,7 @@
#undef apache_mode_t
#endif
-#ifdef apache_stat
+#ifdef xxxapache_stat
#undef stat
#define stat apache_stat
#undef apache_stat
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
