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/11/02 09:45:28 UTC
cvs commit: embperl/test/html importmodule.htm importsub2.htm subimp.pm
richter 00/11/02 00:45:28
Modified: . Tag: Embperl2c Cmd.xs Embperl.xs MANIFEST
MANIFEST.2 ep2.h epcomp.c epdom.c epdom.h test.pl
typemap
Embperl Tag: Embperl2c Syntax.pm
test/html Tag: Embperl2c importmodule.htm importsub2.htm
subimp.pm
Added: test/cmp2 Tag: Embperl2c importmodule.htm importsub.htm
importsub2.htm
Log:
Embperl 2 - importing subs
Revision Changes Path
No revision
No revision
1.1.2.4 +11 -3 embperl/Cmd.xs
Index: Cmd.xs
===================================================================
RCS file: /home/cvs/embperl/Cmd.xs,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- Cmd.xs 2000/10/31 08:02:46 1.1.2.3
+++ Cmd.xs 2000/11/02 08:45:20 1.1.2.4
@@ -65,9 +65,17 @@
void
-embperl_SubStart (pDomTreeSV, xDomTree)
- SV * pDomTreeSV ;
+embperl_SubStart (pDomTreeSV, xDomTree, pSaveAV)
+ SV * pDomTreeSV
int xDomTree
+ AV * pSaveAV
CODE:
- embperl_ExecuteSubStart (pCurrReq, SvRV(pDomTreeSV), xDomTree) ;
+ embperl_ExecuteSubStart (pCurrReq, SvRV(pDomTreeSV), xDomTree, pSaveAV) ;
+
+
+void
+embperl_SubEnd (pSaveAV)
+ AV * pSaveAV
+CODE:
+ embperl_ExecuteSubEnd (pCurrReq, pSaveAV) ;
1.29.4.5 +1 -1 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.29.4.4
retrieving revision 1.29.4.5
diff -u -r1.29.4.4 -r1.29.4.5
--- Embperl.xs 2000/10/17 12:55:43 1.29.4.4
+++ Embperl.xs 2000/11/02 08:45:20 1.29.4.5
@@ -19,7 +19,7 @@
# /* ############################################################################### */
MODULE = HTML::Embperl PACKAGE = HTML::Embperl PREFIX = embperl_
-
+
int
1.50.4.6 +3 -0 embperl/MANIFEST
Index: MANIFEST
===================================================================
RCS file: /home/cvs/embperl/MANIFEST,v
retrieving revision 1.50.4.5
retrieving revision 1.50.4.6
diff -u -r1.50.4.5 -r1.50.4.6
--- MANIFEST 2000/10/31 08:02:47 1.50.4.5
+++ MANIFEST 2000/11/02 08:45:20 1.50.4.6
@@ -20,6 +20,9 @@
test/cmp2/tagscan.htm
test/cmp2/unclosed.htm
test/cmp2/varerr.htm
+test/cmp2/importsub.htm
+test/cmp2/importsub2.htm
+test/cmp2/importmodule.htm
test/html2/error.htm
test/html2/errormismatch.htm
test/html2/errormismatchcmd.htm
1.1.2.4 +3 -0 embperl/Attic/MANIFEST.2
Index: MANIFEST.2
===================================================================
RCS file: /home/cvs/embperl/Attic/MANIFEST.2,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -u -r1.1.2.3 -r1.1.2.4
--- MANIFEST.2 2000/10/31 08:02:47 1.1.2.3
+++ MANIFEST.2 2000/11/02 08:45:20 1.1.2.4
@@ -20,6 +20,9 @@
test/cmp2/tagscan.htm
test/cmp2/unclosed.htm
test/cmp2/varerr.htm
+test/cmp2/importsub.htm
+test/cmp2/importsub2.htm
+test/cmp2/importmodule.htm
test/html2/error.htm
test/html2/errormismatch.htm
test/html2/errormismatchcmd.htm
1.1.2.5 +8 -1 embperl/Attic/ep2.h
Index: ep2.h
===================================================================
RCS file: /home/cvs/embperl/Attic/ep2.h,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -r1.1.2.4 -r1.1.2.5
--- ep2.h 2000/10/31 08:02:48 1.1.2.4
+++ ep2.h 2000/11/02 08:45:20 1.1.2.5
@@ -90,7 +90,14 @@
int embperl_ExecuteSubStart (/*in*/ tReq * r,
/*in*/ SV * pDomTreeSV,
- /*in*/ tIndex xDomTree) ;
+ /*in*/ tIndex xDomTree,
+ /*in*/ AV * pSaveAV) ;
+
+int embperl_ExecuteSubEnd (/*in*/ tReq * r,
+ /*in*/ AV * pSaveAV) ;
+
+
+
1.4.2.14 +79 -6 embperl/Attic/epcomp.c
Index: epcomp.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcomp.c,v
retrieving revision 1.4.2.13
retrieving revision 1.4.2.14
diff -u -r1.4.2.13 -r1.4.2.14
--- epcomp.c 2000/10/31 08:02:48 1.4.2.13
+++ epcomp.c 2000/11/02 08:45:21 1.4.2.14
@@ -1399,40 +1399,113 @@
}
+/* ------------------------------------------------------------------------ */
+/* */
+/* embperl_ExecuteSubStart */
+/* */
+/* Setup the start of a sub */
+/* */
+/* in pDomTreeSV SV which holds the DomTree in the current package */
+/* in xDomTree Source DomTree */
+/* in pSaveAV Array to save some values */
+/* */
+/* ------------------------------------------------------------------------ */
+
int embperl_ExecuteSubStart (/*in*/ tReq * r,
/*in*/ SV * pDomTreeSV,
- /*in*/ tIndex xDomTree)
+ /*in*/ tIndex xDomTree,
+ /*in*/ AV * pSaveAV)
{
tIndex xOrgDomTree ;
+ tIndex xOldDomTree ;
tDomTree * pDomTree ;
tDomTree * pCurrDomTree ;
-
if (SvIOK (pDomTreeSV))
if (xOrgDomTree = SvIVX (pDomTreeSV))
{
- SAVEI32 (r -> xCurrDomTree) ;
- return r -> xCurrDomTree = xOrgDomTree ; /* DomTree already cloned */
+ if (r -> xCurrDomTree == xOrgDomTree)
+ return xOrgDomTree ;
+
+ /*
+ av_push (pSaveAV, newSViv (r -> xCurrDomTree)) ;
+ av_push (pSaveAV, newSViv (r -> xCurrNode)) ;
+ av_push (pSaveAV, newSViv (ArrayGetSize (DomTree_self (xOrgDomTree) -> pOrder))) ;
+
+ if (pCurrReq -> bDebug & dbgParse)
+ lprintf (pCurrReq, "[%d]SUB: Enter from DomTree=%d into DomTree=%d, Source DomTree=%d \n", pCurrReq -> nPid, r -> xCurrDomTree, xOrgDomTree, xDomTree) ;
+ return r -> xCurrDomTree = xOrgDomTree ;*/ /* DomTree already cloned */
}
+ av_push (pSaveAV, newSViv (r -> xCurrDomTree)) ;
+ av_push (pSaveAV, newSViv (r -> xCurrNode)) ;
+
pDomTree = DomTree_self (xDomTree) ;
+ xOldDomTree = r -> xCurrDomTree ;
+
if (!(r -> xCurrDomTree = DomTree_clone (pDomTree, &pCurrDomTree, 1)))
return 0 ;
+
+ av_push (pSaveAV, newSViv (ArrayGetSize (pCurrDomTree -> pOrder))) ;
av_push (r -> pDomTreeAV, pCurrDomTree -> pDomTreeSV) ;
av_push (r -> pCleanupAV, newRV_inc (pDomTreeSV)) ;
- SAVEI32 (r -> xCurrDomTree) ;
sv_setiv (pDomTreeSV, r -> xCurrDomTree) ;
+ if (pCurrReq -> bDebug & dbgParse)
+ lprintf (pCurrReq, "[%d]SUB: Enter from DomTree=%d into new DomTree=%d, Source DomTree=%d \n", pCurrReq -> nPid, xOldDomTree, r -> xCurrDomTree, xDomTree) ;
+
return r -> xCurrDomTree ;
}
/* ------------------------------------------------------------------------ */
/* */
+/* embperl_ExecuteSubEnd */
+/* */
+/* End a sub */
+/* */
+/* in pSaveAV Array to save some values */
+/* */
+/* ------------------------------------------------------------------------ */
+
+
+int embperl_ExecuteSubEnd (/*in*/ tReq * r,
+ /*in*/ AV * pSaveAV)
+
+ {
+ tIndex xSubDomTree = r -> xCurrDomTree ;
+ tIndex xDocFraq ;
+ int nOrderNdx ;
+ tDomTree * pCallerDomTree ;
+ tDomTree * pSubDomTree = DomTree_self (xSubDomTree) ;
+
+ if (AvFILL (pSaveAV) < 1)
+ return ok ;
+
+ DomTree_checkpoint (r -> xCurrDomTree, -1) ;
+
+ r -> xCurrDomTree = SvIV (* av_fetch (pSaveAV, 0, 0)) ;
+ r -> xCurrNode = SvIV (* av_fetch (pSaveAV, 1, 0)) ;
+ nOrderNdx = SvIV (* av_fetch (pSaveAV, 2, 0)) ;
+
+ pCallerDomTree = DomTree_self (r -> xCurrDomTree) ;
+ xDocFraq = Node_replaceChildWithNode (pSubDomTree, pSubDomTree -> xDocument, pCallerDomTree, r -> xCurrNode) ;
+
+ /* Element_selfSetAttribut (pCallerDomTree, Node_self (pCallerDomTree, xDocFraq), NULL, xOrderIndexAttr, NULL, nOrderNdx, 0) ; */
+
+ if (pCurrReq -> bDebug & dbgParse)
+ lprintf (pCurrReq, "[%d]SUB: Leave from DomTree=%d back to DomTree=%d\n", pCurrReq -> nPid, xSubDomTree, r -> xCurrDomTree) ;
+
+ return ok ;
+ }
+
+
+/* ------------------------------------------------------------------------ */
+/* */
/* embperl_Executer */
/* */
/* Parse the whole document */
@@ -1507,7 +1580,7 @@
args[0] = r -> pReqSV ;
if (sSubName)
{
- SV * pSVName = newSVpvf ("%s::%s", r -> Buf.sEvalPackage, sSubName) ;
+ SV * pSVName = newSVpvf ("%s::_ep_sub_%s", r -> Buf.sEvalPackage, sSubName) ;
rc = CallStoredCV (r, r -> pProgRun, (CV *)pSVName, 1, args, 0, &pSV) ;
}
else
1.4.2.5 +16 -8 embperl/Attic/epdom.c
Index: epdom.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.c,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -r1.4.2.4 -r1.4.2.5
--- epdom.c 2000/10/26 06:35:58 1.4.2.4
+++ epdom.c 2000/11/02 08:45:21 1.4.2.5
@@ -35,6 +35,7 @@
tIndex xDomTreeAttr = 0 ;
tIndex xDocument ;
tIndex xDocumentFraq ;
+tIndex xOrderIndexAttr ;
int nCheckpointCache = 0 ;
int nCheckpointCacheMask = 0x1ff ;
@@ -502,6 +503,7 @@
xDomTreeAttr = String2Ndx ("<domtree>", 9) ;
xDocument = String2Ndx ("Document", 8) ;
xDocumentFraq = String2Ndx ("DocumentFraq", 12) ;
+ xOrderIndexAttr = String2Ndx ("<orderindex>", 10) ;
ArrayNew (&pDomTrees, 16, sizeof (tDomTree)) ;
ArrayAdd (&pDomTrees, 1) ;
@@ -774,7 +776,7 @@
(pDomTree -> pOrder)[n].xFromNode = xChild ;
(pDomTree -> pOrder)[n].xToNode = 0 ;
if (pCurrReq -> bDebug & dbgParse)
- lprintf (pCurrReq, "[%d]Checkpoint: Node=%d OrderIndex %d SVs=%d\n", pCurrReq -> nPid, xChild, n, sv_count) ;
+ lprintf (pCurrReq, "[%d]Checkpoint: DomTree=%d Node=%d OrderIndex %d SVs=%d\n", pCurrReq -> nPid, xDomTree, xChild, n, sv_count) ;
}
}
@@ -797,7 +799,7 @@
(pDomTree -> pOrder)[n].xFromNode = xFromNode ;
(pDomTree -> pOrder)[n].xToNode = xToNode ;
if (pCurrReq -> bDebug & dbgParse)
- lprintf (pCurrReq, "[%d]Checkpoint: Node=%d -> %d OrderIndex %d SVs=%d\n", pCurrReq -> nPid, xFromNode, xToNode, n, sv_count) ;
+ lprintf (pCurrReq, "[%d]Checkpoint: DomTree=%d Node=%d -> %d OrderIndex %d SVs=%d\n", pCurrReq -> nPid, pDomTree -> xNdx, xFromNode, xToNode, n, sv_count) ;
}
}
@@ -1314,8 +1316,8 @@
pNew -> xValue = sText?String2NdxNoInc (sText, nTextLen):nTextLen ;
NdxStringRefcntInc (pNew -> xValue) ;
if (pCurrReq -> bDebug & dbgParse)
- lprintf (pCurrReq, "[%d]PARSE: AddNode: +%02d %*s AttributValue parent=%d node=%d type=%d text=%*.*s (#%d)\n", pCurrReq -> nPid, nLevel, nLevel * 2, "", xParent, pNew -> xNdx, nType, nTextLen, nTextLen, sText, sText?String2NdxNoInc (sText,
- nTextLen):-1) ;
+ lprintf (pCurrReq, "[%d]PARSE: AddNode: +%02d %*s AttributValue parent=%d node=%d type=%d text=%*.*s (#%d)\n", pCurrReq -> nPid, nLevel, nLevel * 2, "", xParent, pNew -> xNdx, nType, nTextLen, nTextLen,
+ sText?sText:"<null>", sText?String2NdxNoInc (sText, nTextLen):-1) ;
pNew -> bFlags |= aflgAttrValue ;
return xParent ;
@@ -1378,7 +1380,7 @@
pNew = NodePad_appendChild (pDomTree, &pChilds, nType, xText, nLinenumber) ;
if (pCurrReq -> bDebug & dbgParse)
- lprintf (pCurrReq, "[%d]PARSE: AddNode: +%02d %*s Element parent=%d node=%d type=%d text=%*.*s (#%d)\n", pCurrReq -> nPid, nLevel, nLevel * 2, "", xParent, pNew -> xNdx, nType, nTextLen, nTextLen, sText,
+ lprintf (pCurrReq, "[%d]PARSE: AddNode: +%02d %*s Element parent=%d node=%d type=%d text=%*.*s (#%d)\n", pCurrReq -> nPid, nLevel, nLevel * 2, "", xParent, pNew -> xNdx, nType, nTextLen, nTextLen, sText?sText:"<null>",
sText?String2NdxNoInc (sText, nTextLen):-1) ;
return pNew -> xNdx ;
@@ -1670,7 +1672,7 @@
tNode xOrgChild = xOldChild ;
tStringIndex n ;
- lprintf (pCurrReq, "rp1--> SVs=%d %s DomTree Old=%d\n", sv_count, sText, Node_selfDomTree (Node_self (pDomTree, xOldChild))) ;
+ lprintf (pCurrReq, "rp1--> SVs=%d %s DomTree Old=%d\n", sv_count, sText?sText:"<null>", Node_selfDomTree (Node_self (pDomTree, xOldChild))) ;
Node_condClonePad (pDomTree, xOldChild) ;
pOldChild = Node_self (pDomTree, xOldChild) ;
@@ -1708,7 +1710,7 @@
if (n)
NdxStringFree (n) ;
- lprintf (pCurrReq, "rp<-- nText=%d sText=>%*.*s< nTextLen = %d SVs=%d\n", pOldChild -> nText, nTextLen,nTextLen, sText, nTextLen, sv_count) ;
+ lprintf (pCurrReq, "rp<-- nText=%d sText=>%*.*s< nTextLen = %d SVs=%d\n", pOldChild -> nText, nTextLen,nTextLen, sText?sText:"<null>", nTextLen, sv_count) ;
return xOldChild ;
}
@@ -1993,8 +1995,14 @@
if (pNode -> nType == ntypDocumentFraq)
+ {
+ tAttrData * pOrderIndex = Element_selfGetAttribut (pDomTree, pNode, NULL, xOrderIndexAttr) ;
pDomTree = DomTree_self (Element_selfGetAttribut (pDomTree, pNode, NULL, xDomTreeAttr) -> xValue) ;
+ if (pOrderIndex)
+ nOrderNdx = pOrderIndex -> xValue ;
+ }
+
pNode = Node_selfFirstChild (pDomTree, pNode) ;
while (pNode)
@@ -2399,7 +2407,7 @@
return pAttr ;
}
- if (pNode -> bFlags & nflgModified)
+ if (pNode -> bFlags & nflgModified && bClone)
pNewNode = Node_selfCloneNode (pDomTree, pNode, 1) ;
else
pNewNode = pNode ;
1.4.2.5 +1 -0 embperl/Attic/epdom.h
Index: epdom.h
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.h,v
retrieving revision 1.4.2.4
retrieving revision 1.4.2.5
diff -u -r1.4.2.4 -r1.4.2.5
--- epdom.h 2000/10/18 13:28:53 1.4.2.4
+++ epdom.h 2000/11/02 08:45:21 1.4.2.5
@@ -190,6 +190,7 @@
extern tIndex xDomTreeAttr ; /* String index for Attribut which holds the DomTree index */
extern tIndex xDocument ; /* String index for Document */
extern tIndex xDocumentFraq ; /* String index for Document Fraquent */
+extern tIndex xOrderIndexAttr ; /* String index for Attribute which holds the OrderIndex */
extern int nCheckpointCache ;
extern int nCheckpointCacheMask ;
1.70.4.15 +14 -16 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.14
retrieving revision 1.70.4.15
diff -u -r1.70.4.14 -r1.70.4.15
--- test.pl 2000/10/31 08:02:49 1.70.4.14
+++ test.pl 2000/11/02 08:45:21 1.70.4.15
@@ -198,17 +198,15 @@
'repeat' => 2,
},
'importsub.htm' => {
-# 'version' => 1,
'repeat' => 2,
},
'importsub2.htm' => {
- 'version' => 1,
},
'importmodule.htm' => {
- 'version' => 1,
+# 'version' => 1,
},
'recursexec.htm' => {
- 'version' => 1,
+# 'version' => 1,
},
'nph/div.htm' => {
'option' => '64',
@@ -357,62 +355,62 @@
'EmbperlObject/epopage1.htm' => {
'offline' => 0,
'cgi' => 0,
- 'version' => 1,
+# 'version' => 1,
},
'EmbperlObject/epodiv.htm' => {
'offline' => 0,
'cgi' => 0,
- 'version' => 1,
+# 'version' => 1,
},
'EmbperlObject/sub/epopage2.htm' => {
'offline' => 0,
'cgi' => 0,
- 'version' => 1,
+# 'version' => 1,
},
'EmbperlObject/sub/epopage2.htm' => {
'offline' => 0,
'cgi' => 0,
- 'version' => 1,
+# 'version' => 1,
},
'EmbperlObject/sub/subsub/eposubsub.htm' => {
'offline' => 0,
'cgi' => 0,
- 'version' => 1,
+# 'version' => 1,
},
'EmbperlObject/sub/eponotfound.htm' => {
'offline' => 0,
'cgi' => 0,
- 'version' => 1,
+# 'version' => 1,
},
'EmbperlObject/obj/epoobj1.htm' => {
'offline' => 0,
'cgi' => 0,
- 'version' => 1,
+# 'version' => 1,
},
'EmbperlObject/obj/epoobj2.htm' => {
'offline' => 0,
'cgi' => 0,
- 'version' => 1,
+# 'version' => 1,
},
'EmbperlObject/obj/epoobj3.htm' => {
'offline' => 0,
'cgi' => 0,
- 'version' => 1,
+# 'version' => 1,
},
'EmbperlObject/obj/epoobj4.htm' => {
'offline' => 0,
'cgi' => 0,
- 'version' => 1,
+# 'version' => 1,
},
'EmbperlObject/base2/epostopdir.htm' => {
'offline' => 0,
'cgi' => 0,
- 'version' => 1,
+# 'version' => 1,
},
'EmbperlObject/base3/epobaselib.htm' => {
'offline' => 0,
'cgi' => 0,
- 'version' => 1,
+# 'version' => 1,
},
) ;
1.3.4.3 +8 -0 embperl/typemap
Index: typemap
===================================================================
RCS file: /home/cvs/embperl/typemap,v
retrieving revision 1.3.4.2
retrieving revision 1.3.4.3
diff -u -r1.3.4.2 -r1.3.4.3
--- typemap 2000/10/17 12:55:44 1.3.4.2
+++ typemap 2000/11/02 08:45:21 1.3.4.3
@@ -3,8 +3,16 @@
tReq * T_PTROBJ_REQ
tFile * T_PTROBJ_FILE
tDomNode * T_PTROBJ_DOMNODE
+AV * T_MYAVREF
+HV * T_MYHVREF
INPUT
+T_MYAVREF
+ $var = (AV *)SvRV($arg);
+
+T_MYHVREF
+ $var = (HV *)SvRV($arg);
+
T_PTROBJ_CONF
if (sv_derived_from ($arg, \"HTML::Embperl::Conf\"))
$var = (tConf *)(SvIV((SV *)SvRV($arg))) ;
No revision
No revision
1.1.4.6 +3 -3 embperl/Embperl/Attic/Syntax.pm
Index: Syntax.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Attic/Syntax.pm,v
retrieving revision 1.1.4.5
retrieving revision 1.1.4.6
diff -u -r1.1.4.5 -r1.1.4.6
--- Syntax.pm 2000/10/31 08:02:54 1.1.4.5
+++ Syntax.pm 2000/11/02 08:45:23 1.1.4.6
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Syntax.pm,v 1.1.4.5 2000/10/31 08:02:54 richter Exp $
+# $Id: Syntax.pm,v 1.1.4.6 2000/11/02 08:45:23 richter Exp $
#
###################################################################################
@@ -688,7 +688,7 @@
'endtag' => 'endsub',
'procinfo' => {
embperl => {
- perlcode => 'sub %&<noname>% { HTML::Embperl::Cmd::SubStart(\\$_ep_DomTree,%$q%); ',
+ perlcode => 'sub _ep_sub_%&<noname>% { ',
removenode => 10,
mayjump => 1,
stackname => 'metacmd',
@@ -706,7 +706,7 @@
'cdatatype' => 0,
'procinfo' => {
embperl => {
- perlcode => '}; $_ep_req -> ExportHash -> {%^"subname%} = \&%^subname% ;',
+ perlcode => '}; sub %^subname% { my @_ep_save ; HTML::Embperl::Cmd::SubStart(\\$_ep_DomTree,%$q%,\\@_ep_save); my $_ep_ret = _ep_sub_%^subname% (@_); HTML::Embperl::Cmd::SubEnd(\\@_ep_save); return $_ep_ret } ; $_ep_req -> ExportHash -> {%^"subname%} = \&%^subname% ; ',
removenode => 10,
mayjump => 1,
stackname => 'metacmd',
No revision
No revision
1.1.2.1 +40 -0 embperl/test/cmp2/Attic/importmodule.htm
1.1.2.1 +50 -0 embperl/test/cmp2/Attic/importsub.htm
1.1.2.1 +43 -0 embperl/test/cmp2/Attic/importsub2.htm
No revision
No revision
1.4.6.1 +2 -2 embperl/test/html/importmodule.htm
Index: importmodule.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/importmodule.htm,v
retrieving revision 1.4
retrieving revision 1.4.6.1
diff -u -r1.4 -r1.4.6.1
--- importmodule.htm 1999/10/05 06:03:43 1.4
+++ importmodule.htm 2000/11/02 08:45:26 1.4.6.1
@@ -8,10 +8,10 @@
<h1>Tests for Embperl - Importing from a Perl module</h1>
-[-
+[!
use lib qw{ . } ;
use subimp ;
--]
+!]
First sub:
[- tfirst -]
1.2.6.1 +1 -1 embperl/test/html/importsub2.htm
Index: importsub2.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/importsub2.htm,v
retrieving revision 1.2
retrieving revision 1.2.6.1
diff -u -r1.2 -r1.2.6.1
--- importsub2.htm 1999/10/05 06:03:43 1.2
+++ importsub2.htm 2000/11/02 08:45:26 1.2.6.1
@@ -8,7 +8,7 @@
<h1>Tests for Embperl - Importing subs</h1>
-[- Execute({inputfile => 'subimp.htm', import => 1}) -]
+[! Execute({inputfile => 'subimp.htm', import => 1}) !]
Second sub:
1.4.6.1 +10 -7 embperl/test/html/subimp.pm
Index: subimp.pm
===================================================================
RCS file: /home/cvs/embperl/test/html/subimp.pm,v
retrieving revision 1.4
retrieving revision 1.4.6.1
diff -u -r1.4 -r1.4.6.1
--- subimp.pm 1999/07/06 12:30:51 1.4
+++ subimp.pm 2000/11/02 08:45:26 1.4.6.1
@@ -68,6 +68,16 @@
[$endsub$]
+
+[###### table cell #####]
+[$sub tabcell $]
+
+
+<td>[+ $_[0] -> [$row][$col] +]<td>
+
+[$endsub$]
+
+
[###### table header #####]
[$sub tabheader $]
@@ -78,13 +88,6 @@
[$endsub$]
-[###### table cell #####]
-[$sub tabcell $]
-
-
-<td>[+ $_[0] -> [$row][$col] +]<td>
-
-[$endsub$]
[###### table footer #####]
[$sub tabfooter $]