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...@apache.org on 2001/04/10 10:03:46 UTC
cvs commit: embperl/test/html subtab.htm
richter 01/04/10 01:03:46
Modified: . Tag: Embperl2c DOM.xs epdom.c test.pl
Embperl/Syntax Tag: Embperl2c EmbperlBlocks.pm
Added: test/html Tag: Embperl2c subtab.htm
Log:
Embperl 2 - fix for sub handling
Revision Changes Path
No revision
No revision
1.1.2.10 +5 -5 embperl/DOM.xs
Index: DOM.xs
===================================================================
RCS file: /home/cvs/embperl/DOM.xs,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -r1.1.2.9 -r1.1.2.10
--- DOM.xs 2001/03/28 12:58:18 1.1.2.9
+++ DOM.xs 2001/04/10 08:03:43 1.1.2.10
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: DOM.xs,v 1.1.2.9 2001/03/28 12:58:18 richter Exp $
+# $Id: DOM.xs,v 1.1.2.10 2001/04/10 08:03:43 richter Exp $
#
###################################################################################
@@ -123,7 +123,7 @@
XSRETURN(1) ;
SV *
-embperl_Node_iReplaceChildWithUrlDATA (xDomTree, xOldChild,sText)
+embperl_Node_iReplaceChildWithUrlDATA (xOldChild,sText)
int xDomTree
int xOldChild
SV * sText
@@ -131,7 +131,7 @@
SV * sRet ;
PPCODE:
SvGETMAGIC_P4(sText) ;
- sRet = Node_replaceChildWithUrlDATA (xDomTree, xOldChild,sText) ;
+ sRet = Node_replaceChildWithUrlDATA (pCurrReq -> xCurrDomTree, xOldChild,sText) ;
ST(0) = sRet ;
XSRETURN(1) ;
@@ -223,11 +223,11 @@
DomTree_checkpoint (pCurrReq -> xCurrDomTree, xChild) ;
void
-embperl_DomTree_iDiscardAfterCheckpoint (xDomTree, xNode)
+embperl_DomTree_iDiscardAfterCheckpoint (xNode)
int xDomTree
int xNode
CODE:
- DomTree_discardAfterCheckpoint (xDomTree, xNode) ;
+ DomTree_discardAfterCheckpoint (pCurrReq -> xCurrDomTree, xNode) ;
#void
#Node_parentNode (xChild)
1.4.2.29 +16 -3 embperl/Attic/epdom.c
Index: epdom.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.c,v
retrieving revision 1.4.2.28
retrieving revision 1.4.2.29
diff -u -r1.4.2.28 -r1.4.2.29
--- epdom.c 2001/03/28 12:58:20 1.4.2.28
+++ epdom.c 2001/04/10 08:03:44 1.4.2.29
@@ -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.28 2001/03/28 12:58:20 richter Exp $
+# $Id: epdom.c,v 1.4.2.29 2001/04/10 08:03:44 richter Exp $
#
###################################################################################*/
@@ -402,7 +402,6 @@
int nNdx ;
char * p ;
-
if (numElements > pCtrl -> nMax)
ArraySet (pArray, numElements) ;
@@ -561,9 +560,11 @@
numStr++ ;
+ /*
if (nNdx < 6 || nNdx == 92)
lprintf (pCurrReq, "new string %s (#%d) refcnt=%d\n", Ndx2String (nNdx), nNdx, SvREFCNT(pSVNdx)) ;
-
+ */
+
return nNdx ;
}
@@ -2109,10 +2110,14 @@
if (pNode -> nType == ntypDocumentFraq)
{
+ int o = pDomTree -> xNdx ;
tAttrData * pOrderIndex = Element_selfGetAttribut (pDomTree, pNode, NULL, xOrderIndexAttr) ;
pDomTree = DomTree_self (Element_selfGetAttribut (pDomTree, pNode, NULL, xDomTreeAttr) -> xValue) ;
if (pOrderIndex)
nOrderNdx = pOrderIndex -> xValue ;
+ if (pCurrReq -> bDebug & dbgParse)
+ lprintf (r, "[%d]toString: ** Switch from DomTree=%d to new DomTree=%d (OrderIndex is now %d)\n", r -> nPid, o, pDomTree -> xNdx, nOrderNdx) ;
+
}
@@ -2167,6 +2172,7 @@
tDomTreeOrder * pOrder = pDomTree -> pOrder ;
int n = ArrayGetSize (pOrder) ;
int i = nOrderNdx ;
+ lprintf (r, "[%d]toString: %d = %d -> %d max = %d\n", r -> nPid, i, pOrder[i].xFromNode, pOrder[i].xToNode, n-1) ;
while (pOrder[i].xFromNode != pNode -> xNdx && i < n)
i++ ;
@@ -2188,6 +2194,13 @@
}
else
{
+ if (pCurrReq -> bDebug & dbgParse)
+ {
+ lprintf (r, "[%d]toString: Failed to Replace Node=%d DomTree=%d (initial OrderIndex %d, max = %d)\n", r -> nPid, pNode -> xNdx, pDomTree -> xNdx, nOrderNdx, n-1) ;
+ //for (i = nOrderNdx; i < n; i++)
+ for (i = 0; i < 5; i++)
+ lprintf (r, "[%d]toString: %d = %d -> %d\n", r -> nPid, i, pOrder[i].xFromNode, pOrder[i].xToNode) ;
+ }
mydie ("Internal Error: Orderindex out of range") ;
}
}
1.70.4.44 +2 -1 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.43
retrieving revision 1.70.4.44
diff -u -r1.70.4.43 -r1.70.4.44
--- test.pl 2001/03/29 05:28:42 1.70.4.43
+++ test.pl 2001/04/10 08:03:44 1.70.4.44
@@ -11,7 +11,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: test.pl,v 1.70.4.43 2001/03/29 05:28:42 richter Exp $
+# $Id: test.pl,v 1.70.4.44 2001/04/10 08:03:44 richter Exp $
#
###################################################################################
@@ -248,6 +248,7 @@
},
'sub.htm' => { },
'sub.htm' => { },
+ 'subtab.htm' => { },
'exit.htm' => {
'version' => 1,
'offline' => 0,
No revision
No revision
1.1.2.12 +17 -17 embperl/Embperl/Syntax/Attic/EmbperlBlocks.pm
Index: EmbperlBlocks.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/EmbperlBlocks.pm,v
retrieving revision 1.1.2.11
retrieving revision 1.1.2.12
diff -u -r1.1.2.11 -r1.1.2.12
--- EmbperlBlocks.pm 2001/03/28 19:15:32 1.1.2.11
+++ EmbperlBlocks.pm 2001/04/10 08:03:45 1.1.2.12
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: EmbperlBlocks.pm,v 1.1.2.11 2001/03/28 19:15:32 richter Exp $
+# $Id: EmbperlBlocks.pm,v 1.1.2.12 2001/04/10 08:03:45 richter Exp $
#
###################################################################################
@@ -358,13 +358,13 @@
'procinfo' => {
embperl => {
perlcode => [
- #'$_ep_node=%$l%;if (!defined (scalar(do{%#~0:$col%}))) %#~-0:$row% { if ($col == 0) { _ep_dcp (%$t%,%^*htmltable%) ; last l%^*htmltable% ; } else { _ep_dcp (%$t%,%^*htmlrow%) ; last l%^*htmlrow% ; }}',
- #'$_ep_node=%$l%;if (!defined (scalar(do{%#~0:$col%}))) { _ep_dcp (%$t%,%^*htmlrow%) ; last l%^*htmlrow% ; }',
- #'$_ep_node=%$l%;if (!defined (scalar(do{%#~0:$row%}))) { _ep_dcp (%$t%,%^*htmltable%) ; last l%^*htmltable% ; }',
+ #'$_ep_node=%$l%;if (!defined (scalar(do{%#~0:$col%}))) %#~-0:$row% { if ($col == 0) { _ep_dcp (%^*htmltable%) ; last l%^*htmltable% ; } else { _ep_dcp (%^*htmlrow%) ; last l%^*htmlrow% ; }}',
+ #'$_ep_node=%$l%;if (!defined (scalar(do{%#~0:$col%}))) { _ep_dcp (%^*htmlrow%) ; last l%^*htmlrow% ; }',
+ #'$_ep_node=%$l%;if (!defined (scalar(do{%#~0:$row%}))) { _ep_dcp (%^*htmltable%) ; last l%^*htmltable% ; }',
#'$_ep_node=%$l%;{%#0%;}',
- '%$c%if (!defined (scalar(do{%#~0:$col%}))) %#~-0:$row% { if ($col == 0) { _ep_dcp (%$t%,%^*htmltable%) ; last l%^*htmltable% ; } else { _ep_dcp (%$t%,%^*htmlrow%) ; last l%^*htmlrow% ; }}',
- '%$c%if (!defined (scalar(do{%#~0:$col%}))) { _ep_dcp (%$t%,%^*htmlrow%) ; last l%^*htmlrow% ; }',
- '%$c%if (!defined (scalar(do{%#~0:$row%}))) { _ep_dcp (%$t%,%^*htmltable%) ; last l%^*htmltable% ; }',
+ '%$c%if (!defined (scalar(do{%#~0:$col%}))) %#~-0:$row% { if ($col == 0) { _ep_dcp (%^*htmltable%) ; last l%^*htmltable% ; } else { _ep_dcp (%^*htmlrow%) ; last l%^*htmlrow% ; }}',
+ '%$c%if (!defined (scalar(do{%#~0:$col%}))) { _ep_dcp (%^*htmlrow%) ; last l%^*htmlrow% ; }',
+ '%$c%if (!defined (scalar(do{%#~0:$row%}))) { _ep_dcp (%^*htmltable%) ; last l%^*htmltable% ; }',
'%$c%{%#0%;}',
],
removenode => 3,
@@ -432,14 +432,14 @@
embperl => {
perlcode =>
[
- #'if (!defined (_ep_rp(%$n%,scalar(do{%#~0:$col%})))) %#~-0:$row% { if ($col == 0) { _ep_dcp (%$t%,%^*htmltable%) ; last l%^*htmltable% ; } else { _ep_dcp (%$t%,%^*htmlrow%) ; last l%^*htmlrow% ; }}',
- #'if (!defined (_ep_rp(%$n%,scalar(do{%#~0:$col%})))) { _ep_dcp (%$t%,%^*htmlrow%) ; last l%^*htmlrow% ; }',
- #'if (!defined (_ep_rp(%$n%,scalar(do{%#~0:$row%})))) { _ep_dcp (%$t%,%^*htmltable%) ; last l%^*htmltable% ; }',
+ #'if (!defined (_ep_rp(%$n%,scalar(do{%#~0:$col%})))) %#~-0:$row% { if ($col == 0) { _ep_dcp (%^*htmltable%) ; last l%^*htmltable% ; } else { _ep_dcp (%^*htmlrow%) ; last l%^*htmlrow% ; }}',
+ #'if (!defined (_ep_rp(%$n%,scalar(do{%#~0:$col%})))) { _ep_dcp (%^*htmlrow%) ; last l%^*htmlrow% ; }',
+ #'if (!defined (_ep_rp(%$n%,scalar(do{%#~0:$row%})))) { _ep_dcp (%^*htmltable%) ; last l%^*htmltable% ; }',
#'_ep_rp(%$n%,scalar(do{%#0%}));',
#'_ep_rp(%$n%,scalar (%#0%));',
- 'if (!defined (_ep_rp(%$x%,scalar(%#~0:$col%)))) %#~-0:$row% { if ($col == 0) { _ep_dcp (%$t%,%^*htmltable%) ; last l%^*htmltable% ; } else { _ep_dcp (%$t%,%^*htmlrow%) ; last l%^*htmlrow% ; }}',
- 'if (!defined (_ep_rp(%$x%,scalar(%#~0:$col%)))) { _ep_dcp (%$t%,%^*htmlrow%) ; last l%^*htmlrow% ; }',
- 'if (!defined (_ep_rp(%$x%,scalar(%#~0:$row%)))) { _ep_dcp (%$t%,%^*htmltable%) ; last l%^*htmltable% ; }',
+ 'if (!defined (_ep_rp(%$x%,scalar(%#~0:$col%)))) %#~-0:$row% { if ($col == 0) { _ep_dcp (%^*htmltable%) ; last l%^*htmltable% ; } else { _ep_dcp (%^*htmlrow%) ; last l%^*htmlrow% ; }}',
+ 'if (!defined (_ep_rp(%$x%,scalar(%#~0:$col%)))) { _ep_dcp (%^*htmlrow%) ; last l%^*htmlrow% ; }',
+ 'if (!defined (_ep_rp(%$x%,scalar(%#~0:$row%)))) { _ep_dcp (%^*htmltable%) ; last l%^*htmltable% ; }',
'_ep_rp(%$x%,scalar(%#0%));',
],
removenode => 4,
@@ -461,10 +461,10 @@
embperl => {
perlcode =>
[
- 'if (!defined (_ep_rpurl(%$n%,scalar(do{%#~0:$col%})))) %#~-0:$row% { if ($col == 0) { _ep_dcp (%$t%,%^*htmltable%) ; last l%^*htmltable% ; } else { _ep_dcp (%$t%,%^*htmlrow%) ; last l%^*htmlrow% ; }}',
- 'if (!defined (_ep_rpurl(%$n%,scalar(do{%#~0:$col%})))) { _ep_dcp (%$t%,%^*htmlrow%) ; last l%^*htmlrow% ; }',
- 'if (!defined (_ep_rpurl(%$n%,scalar($val3=do{%#~0:$row%;})))) { _ep_dcp (%$t%,%^*htmltable%) ; last l%^*htmltable% ; }',
- '_ep_rpurl(%$n%,scalar(do{%#0%}));',
+ 'if (!defined (_ep_rpurl(%$x%,scalar(do{%#~0:$col%})))) %#~-0:$row% { if ($col == 0) { _ep_dcp (%^*htmltable%) ; last l%^*htmltable% ; } else { _ep_dcp (%^*htmlrow%) ; last l%^*htmlrow% ; }}',
+ 'if (!defined (_ep_rpurl(%$x%,scalar(do{%#~0:$col%})))) { _ep_dcp (%^*htmlrow%) ; last l%^*htmlrow% ; }',
+ 'if (!defined (_ep_rpurl(%$x%,scalar($val3=do{%#~0:$row%;})))) { _ep_dcp (%^*htmltable%) ; last l%^*htmltable% ; }',
+ '_ep_rpurl(%$x%,scalar(do{%#0%}));',
],
removenode => 4,
mayjump => '%#~0:$col|$row|$cnt% %?*htmlrow% %?*htmltable%',
No revision
No revision
1.1.2.1 +62 -0 embperl/test/html/Attic/subtab.htm
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org