richter 02/01/22 07:46:22
Modified: . Tag: Embperl2c Cmd.xs DOM.xs Embperl.xs Makefile.PL
Old.xs Syntax.xs epinit.c epprovider.c
Log:
Revision Changes Path
No revision
No revision
1.1.2.11 +8 -8 embperl/Cmd.xs
Index: Cmd.xs
===================================================================
RCS file: /home/cvs/embperl/Cmd.xs,v
retrieving revision 1.1.2.10
retrieving revision 1.1.2.11
diff -u -r1.1.2.10 -r1.1.2.11
--- Cmd.xs 13 Dec 2001 15:13:54 -0000 1.1.2.10
+++ Cmd.xs 22 Jan 2002 15:46:21 -0000 1.1.2.11
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Cmd.xs,v 1.1.2.10 2001/12/13 15:13:54 richter Exp $
+# $Id: Cmd.xs,v 1.1.2.11 2002/01/22 15:46:21 richter Exp $
#
###################################################################################
@@ -40,7 +40,7 @@
STRLEN nValue ;
char * sN = SV2String (sName, nName) ;
char * sV = SV2String (sValue, nValue) ;
- embperlCmd_InputCheck (pCurrReq, DomTree_self (xDomTree), xNode, pCurrReq ->
nCurrRepeatLevel, sN, nName, sV, nValue, SvOK (bSetInSource)?1:0) ;
+ embperlCmd_InputCheck (CurrReq, DomTree_self (xDomTree), xNode, CurrReq ->
Component.nCurrRepeatLevel, sN, nName, sV, nValue, SvOK (bSetInSource)?1:0) ;
void
@@ -55,7 +55,7 @@
STRLEN nValue ;
char * sN = SV2String (sName, nName) ;
char * sV = SV2String (sValue, nValue) ;
- embperlCmd_Option (pCurrReq, DomTree_self (xDomTree), xNode, pCurrReq ->
nCurrRepeatLevel, sN, nName, sV, nValue, SvOK (bSetInSource)?1:0) ;
+ embperlCmd_Option (CurrReq, DomTree_self (xDomTree), xNode, CurrReq ->
Component.nCurrRepeatLevel, sN, nName, sV, nValue, SvOK (bSetInSource)?1:0) ;
void
@@ -64,7 +64,7 @@
int xNode
char * sArg
CODE:
- embperlCmd_Hidden (pCurrReq, DomTree_self (xDomTree), xNode, pCurrReq ->
nCurrRepeatLevel, sArg) ;
+ embperlCmd_Hidden (CurrReq, DomTree_self (xDomTree), xNode, CurrReq ->
Component.nCurrRepeatLevel, sArg) ;
void
@@ -78,13 +78,13 @@
CODE:
if (nAddSess == 2)
{
- embperlCmd_AddSessionIdToHidden (pCurrReq, DomTree_self (xDomTree), xNode,
pCurrReq -> nCurrRepeatLevel) ;
+ embperlCmd_AddSessionIdToHidden (CurrReq, DomTree_self (xDomTree), xNode,
CurrReq -> Component.nCurrRepeatLevel) ;
}
else
{
for (i = 3; i < items; i++)
{
- embperlCmd_AddSessionIdToLink (pCurrReq, DomTree_self (xDomTree),
xNode, pCurrReq -> nCurrRepeatLevel, (char *)SvPV(ST(i), l)) ;
+ embperlCmd_AddSessionIdToLink (CurrReq, DomTree_self (xDomTree), xNode,
CurrReq -> Component.nCurrRepeatLevel, (char *)SvPV(ST(i), l)) ;
}
}
@@ -94,7 +94,7 @@
int xDomTree
AV * pSaveAV
CODE:
- embperl_ExecuteSubStart (pCurrReq, pDomTreeSV, xDomTree, pSaveAV) ;
+ embperl_ExecuteSubStart (CurrReq, pDomTreeSV, xDomTree, pSaveAV) ;
void
@@ -102,5 +102,5 @@
SV * pDomTreeSV
AV * pSaveAV
CODE:
- embperl_ExecuteSubEnd (pCurrReq, pDomTreeSV, pSaveAV) ;
+ embperl_ExecuteSubEnd (CurrReq, pDomTreeSV, pSaveAV) ;
1.1.2.22 +34 -34 embperl/DOM.xs
Index: DOM.xs
===================================================================
RCS file: /home/cvs/embperl/DOM.xs,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- DOM.xs 23 Nov 2001 07:50:59 -0000 1.1.2.21
+++ DOM.xs 22 Jan 2002 15:46:22 -0000 1.1.2.22
@@ -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.21 2001/11/23 07:50:59 richter Exp $
+# $Id: DOM.xs,v 1.1.2.22 2002/01/22 15:46:22 richter Exp $
#
###################################################################################
@@ -54,7 +54,7 @@
SV *
-embperl_Node_replaceChildWithCDATA (pDomNode,sText)
+embperl_Node_replaceChildWithCDATA (CurrApp, pDomNode,sText)
tDomNode * pDomNode
SV * sText
PREINIT:
@@ -63,9 +63,9 @@
PPCODE:
SvGETMAGIC_P4(sText) ;
s = SV2String (sText, l) ;
- Node_replaceChildWithCDATA (DomTree_self(pDomNode -> xDomTree), pDomNode ->
xNode, pCurrReq -> nCurrRepeatLevel, s, l, (pCurrReq -> nCurrEscMode & 11)== 3?1 +
(pCurrReq -> nCurrEscMode & 4):pCurrReq -> nCurrEscMode, 0) ;
- pCurrReq -> nCurrEscMode = pCurrReq -> nEscMode ;
- pCurrReq -> bEscModeSet = -1 ;
+ Node_replaceChildWithCDATA (CurrApp, DomTree_self(pDomNode -> xDomTree),
pDomNode -> xNode, CurrReq -> Component.nCurrRepeatLevel, s, l, (CurrReq ->
Component.nCurrEscMode & 11)== 3?1 + (CurrReq -> Component.nCurrEscMode & 4):CurrReq
-> Component.nCurrEscMode, 0) ;
+ CurrReq -> Component.nCurrEscMode = CurrReq -> Component.Config.nEscMode ;
+ CurrReq -> Component.bEscModeSet = -1 ;
/*SvREFCNT_inc (sText) ;*/
ST(0) = sText ;
XSRETURN(1) ;
@@ -82,9 +82,9 @@
PPCODE:
SvGETMAGIC_P4(sText) ;
s = SV2String (sText, l) ;
- Node_replaceChildWithCDATA (DomTree_self(xDomTree), xOldChild, pCurrReq ->
nCurrRepeatLevel, s, l, (pCurrReq -> nCurrEscMode & 11)== 3?1 + (pCurrReq ->
nCurrEscMode & 4):pCurrReq -> nCurrEscMode, 0) ;
- pCurrReq -> nCurrEscMode = pCurrReq -> nEscMode ;
- pCurrReq -> bEscModeSet = -1 ;
+ Node_replaceChildWithCDATA (CurrApp, DomTree_self(xDomTree), xOldChild, CurrReq
-> Component.nCurrRepeatLevel, s, l, (CurrReq -> Component.nCurrEscMode & 11)== 3?1 +
(CurrReq -> Component.nCurrEscMode & 4):CurrReq -> Component.nCurrEscMode, 0) ;
+ CurrReq -> Component.nCurrEscMode = CurrReq -> Component.Config.nEscMode ;
+ CurrReq -> Component.bEscModeSet = -1 ;
/*SvREFCNT_inc (sText) ;*/
ST(0) = sText ;
XSRETURN(1) ;
@@ -100,9 +100,9 @@
PPCODE:
SvGETMAGIC_P4(sText) ;
s = SV2String (sText, l) ;
- Node_replaceChildWithCDATA (DomTree_self(pCurrReq -> xCurrDomTree), xOldChild,
pCurrReq -> nCurrRepeatLevel, s, l, (pCurrReq -> nCurrEscMode & 11)== 3?1 + (pCurrReq
-> nCurrEscMode & 4):pCurrReq -> nCurrEscMode, 0) ;
- pCurrReq -> nCurrEscMode = pCurrReq -> nEscMode ;
- pCurrReq -> bEscModeSet = -1 ;
+ Node_replaceChildWithCDATA (CurrApp, DomTree_self(CurrReq ->
Component.xCurrDomTree), xOldChild, CurrReq -> Component.nCurrRepeatLevel, s, l,
(CurrReq -> Component.nCurrEscMode & 11)== 3?1 + (CurrReq -> Component.nCurrEscMode &
4):CurrReq -> Component.nCurrEscMode, 0) ;
+ CurrReq -> Component.nCurrEscMode = CurrReq -> Component.Config.nEscMode ;
+ CurrReq -> Component.bEscModeSet = -1 ;
/*SvREFCNT_inc (sText) ;*/
ST(0) = sText ;
XSRETURN(1) ;
@@ -117,7 +117,7 @@
SV * sRet ;
PPCODE:
SvGETMAGIC_P4(sText) ;
- sRet = Node_replaceChildWithUrlDATA (pDomNode -> xDomTree, pDomNode -> xNode,
pCurrReq -> nCurrRepeatLevel, sText) ;
+ sRet = Node_replaceChildWithUrlDATA (CurrReq, pDomNode -> xDomTree, pDomNode ->
xNode, CurrReq -> Component.nCurrRepeatLevel, sText) ;
ST(0) = sRet ;
XSRETURN(1) ;
@@ -130,7 +130,7 @@
SV * sRet ;
PPCODE:
SvGETMAGIC_P4(sText) ;
- sRet = Node_replaceChildWithUrlDATA (pCurrReq -> xCurrDomTree, xOldChild,
pCurrReq -> nCurrRepeatLevel, sText) ;
+ sRet = Node_replaceChildWithUrlDATA (CurrReq, CurrReq ->
Component.xCurrDomTree, xOldChild, CurrReq -> Component.nCurrRepeatLevel, sText) ;
ST(0) = sRet ;
XSRETURN(1) ;
@@ -140,7 +140,7 @@
embperl_Node_removeChild (pDomNode)
tDomNode * pDomNode
CODE:
- Node_removeChild (DomTree_self (pDomNode -> xDomTree), -1, pDomNode -> xNode,
0) ;
+ Node_removeChild (CurrApp, DomTree_self (pDomNode -> xDomTree), -1, pDomNode ->
xNode, 0) ;
void
@@ -148,7 +148,7 @@
int xDomTree
int xChild
CODE:
- Node_removeChild (DomTree_self (xDomTree), -1, xChild, 0) ;
+ Node_removeChild (CurrApp, DomTree_self (xDomTree), -1, xChild, 0) ;
void
@@ -164,7 +164,7 @@
CODE:
sT = SV2String (sText, nText) ;
pDomTree = DomTree_self(pParentNode -> xDomTree) ;
- Node_appendChild (pDomTree, pParentNode -> xNode, pCurrReq -> nCurrRepeatLevel,
nType, 0, sT, nText, 0, 0, NULL) ;
+ Node_appendChild (CurrApp, pDomTree, pParentNode -> xNode, CurrReq ->
Component.nCurrRepeatLevel, nType, 0, sT, nText, 0, 0, NULL) ;
void
@@ -178,7 +178,7 @@
STRLEN nText ;
char * sT = SV2String (sText, nText) ;
tDomTree * pDomTree = DomTree_self(xDomTree) ;
- Node_appendChild (pDomTree, xParent, pCurrReq -> nCurrRepeatLevel, nType, 0,
sT, nText, 0, 0, NULL) ;
+ Node_appendChild (CurrApp, pDomTree, xParent, CurrReq ->
Component.nCurrRepeatLevel, nType, 0, sT, nText, 0, 0, NULL) ;
char *
@@ -189,12 +189,12 @@
PREINIT:
char * sText ;
CODE:
- sText = Node_childsText (DomTree_self (xDomTree), xChild, pCurrReq ->
nCurrRepeatLevel, 0, bDeep) ;
+ sText = Node_childsText (CurrApp, DomTree_self (xDomTree), xChild, CurrReq ->
Component.nCurrRepeatLevel, 0, bDeep) ;
RETVAL = sText?sText:"" ;
OUTPUT:
RETVAL
CLEANUP:
- StringFree (&sText) ;
+ StringFree (CurrApp, &sText) ;
################################################################################
@@ -205,15 +205,15 @@
embperl_DomTree_iCheckpoint (nCheckpoint)
int nCheckpoint
CODE:
- pCurrReq -> nCurrEscMode = pCurrReq -> nEscMode ;
- pCurrReq -> bEscModeSet = -1 ;
- DomTree_checkpoint (pCurrReq, nCheckpoint) ;
+ CurrReq -> Component.nCurrEscMode = CurrReq -> Component.Config.nEscMode ;
+ CurrReq -> Component.bEscModeSet = -1 ;
+ DomTree_checkpoint (CurrReq, nCheckpoint) ;
void
embperl_DomTree_iDiscardAfterCheckpoint (nCheckpoint)
int nCheckpoint
CODE:
- DomTree_discardAfterCheckpoint (pCurrReq, nCheckpoint) ;
+ DomTree_discardAfterCheckpoint (CurrReq, nCheckpoint) ;
#void
#Node_parentNode (xChild)
@@ -246,7 +246,7 @@
pDomTree = DomTree_self (pDomNode -> xDomTree) ;
- Element_selfSetAttribut (pDomTree, Node_self (pDomTree, pDomNode -> xNode),
pCurrReq -> nCurrRepeatLevel, sA, nAttr, sT, nText) ;
+ Element_selfSetAttribut (CurrApp, pDomTree, Node_self (pDomTree, pDomNode ->
xNode), CurrReq -> Component.nCurrRepeatLevel, sA, nAttr, sT, nText) ;
void
@@ -262,7 +262,7 @@
char * sA = SV2String (sAttr, nAttr) ;
tDomTree * pDomTree = DomTree_self (xDomTree) ;
- Element_selfSetAttribut (pDomTree, Node_self (pDomTree, xNode), pCurrReq ->
nCurrRepeatLevel, sA, nAttr, sT, nText) ;
+ Element_selfSetAttribut (CurrApp, pDomTree, Node_self (pDomTree, xNode),
CurrReq -> Component.nCurrRepeatLevel, sA, nAttr, sT, nText) ;
@@ -279,7 +279,7 @@
sA = SV2String (sAttr, nAttr) ;
pDomTree = DomTree_self (pDomNode -> xDomTree) ;
- Element_selfRemoveAttribut (pDomTree, Node_self (pDomTree, pDomNode -> xNode),
pCurrReq -> nCurrRepeatLevel, sA, nAttr) ;
+ Element_selfRemoveAttribut (CurrApp, pDomTree, Node_self (pDomTree, pDomNode ->
xNode), CurrReq -> Component.nCurrRepeatLevel, sA, nAttr) ;
void
@@ -292,7 +292,7 @@
char * sA = SV2String (sAttr, nAttr) ;
tDomTree * pDomTree = DomTree_self (xDomTree) ;
- Element_selfRemoveAttribut (pDomTree, Node_self (pDomTree, xNode), pCurrReq ->
nCurrRepeatLevel, sA, nAttr) ;
+ Element_selfRemoveAttribut (CurrApp, pDomTree, Node_self (pDomTree, xNode),
CurrReq -> Component.nCurrRepeatLevel, sA, nAttr) ;
################################################################################
@@ -310,9 +310,9 @@
CODE:
pDomTree = DomTree_self (pAttr -> xDomTree) ;
- Attr_selfValue (pDomTree, Attr_self(pDomTree, pAttr -> xNode), pCurrReq ->
nCurrRepeatLevel, &sAttrText) ;
- RETVAL = newSVpv (sAttrText, ArrayGetSize (sAttrText)) ;
- StringFree (&sAttrText) ;
+ Attr_selfValue (CurrApp, pDomTree, Attr_self(pDomTree, pAttr -> xNode), CurrReq
-> Component.nCurrRepeatLevel, &sAttrText) ;
+ RETVAL = newSVpv (sAttrText, ArrayGetSize (CurrApp, sAttrText)) ;
+ StringFree (CurrApp, &sAttrText) ;
OUTPUT:
RETVAL
@@ -326,12 +326,12 @@
char * sAttrText = NULL ;
tAttrData * pAttr ;
- /* lprintf (pCurrReq, "xDomTree=%d, xAttr=%d pDomTree=%x\n", xDomTree, xAttr,
pDomTree) ;*/
+ /* lprintf (CurrReq, "xDomTree=%d, xAttr=%d pDomTree=%x\n", xDomTree, xAttr,
pDomTree) ;*/
pAttr = Attr_self(pDomTree, xAttr) ;
- Attr_selfValue (pDomTree, pAttr , pCurrReq -> nCurrRepeatLevel, &sAttrText) ;
- RETVAL = newSVpv (sAttrText, ArrayGetSize (sAttrText)) ;
- StringFree (&sAttrText) ;
+ Attr_selfValue (CurrApp, pDomTree, pAttr , CurrReq ->
Component.nCurrRepeatLevel, &sAttrText) ;
+ RETVAL = newSVpv (sAttrText, ArrayGetSize (CurrApp, sAttrText)) ;
+ StringFree (CurrApp, &sAttrText) ;
OUTPUT:
RETVAL
1.29.4.40 +1 -1 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.29.4.39
retrieving revision 1.29.4.40
diff -u -r1.29.4.39 -r1.29.4.40
--- Embperl.xs 22 Jan 2002 10:59:34 -0000 1.29.4.39
+++ Embperl.xs 22 Jan 2002 15:46:22 -0000 1.29.4.40
@@ -66,7 +66,7 @@
-# /* INCLUDE: Old.xs */
+INCLUDE: Old.xs
MODULE = Embperl PACKAGE = Embperl PREFIX = embperl_
1.31.4.44 +3 -3 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.31.4.43
retrieving revision 1.31.4.44
diff -u -r1.31.4.43 -r1.31.4.44
--- Makefile.PL 22 Jan 2002 10:59:34 -0000 1.31.4.43
+++ Makefile.PL 22 Jan 2002 15:46:22 -0000 1.31.4.44
@@ -3,7 +3,7 @@
#
# (C) 1997-2001 G.Richter ([EMAIL PROTECTED]) / ECOS
#
-# $Id: Makefile.PL,v 1.31.4.43 2002/01/22 10:59:34 richter Exp $
+# $Id: Makefile.PL,v 1.31.4.44 2002/01/22 15:46:22 richter Exp $
#
@@ -1173,7 +1173,7 @@
xs/Embperl/Thread/Thread
}) . '$(OBJ_EXT)';
-$sublibs = s/\//\\/g if ($win32) ;
+$sublibs =~ s/\//\\/g if ($win32) ;
$o .= $sublibs ;
WriteMakefile(
@@ -1193,7 +1193,7 @@
'ABSTRACT' => 'Embed Perl code in HTML documents',
'AUTHOR' => 'Gerald Richter <[EMAIL PROTECTED]>',
'macro' => $makemacros,
- $EP2?('depend' => { 'Embperl.c' => 'Embperl.xs DOM.xs Cmd.xs Syntax.xs'
}):(),
+ $EP2?('depend' => { 'Embperl.c' => 'Embperl.xs DOM.xs Cmd.xs Syntax.xs
Old.xs' }):(),
);
1.1.2.2 +19 -222 embperl/Attic/Old.xs
Index: Old.xs
===================================================================
RCS file: /home/cvs/embperl/Attic/Old.xs,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -r1.1.2.1 -r1.1.2.2
--- Old.xs 22 Jan 2002 10:59:34 -0000 1.1.2.1
+++ Old.xs 22 Jan 2002 15:46:22 -0000 1.1.2.2
@@ -4,26 +4,6 @@
PROTOTYPES: ENABLE
-int
-embperl_XS_Init(nIOType, sLogFile, nDebugDefault)
- int nIOType
- char * sLogFile
- int nDebugDefault
-CODE:
- RETVAL = Init(nIOType, sLogFile, nDebugDefault) ;
-OUTPUT:
- RETVAL
-
-
-
-
-int
-embperl_XS_Term()
-CODE:
- RETVAL = Term() ;
-OUTPUT:
- RETVAL
-
# /* ---- Helper ----- */
@@ -99,60 +79,8 @@
RETVAL
-# /* ---- Configuration data ----- */
-
-tConf *
-embperl_SetupConfData(req,opcodemask)
- HV * req = NO_INIT
- SV * opcodemask
-INIT:
- req = (HV *)SvRV(ST(0));
-CODE:
- RETVAL = SetupConfData(req, opcodemask) ;
-OUTPUT:
- RETVAL
-
-
-int
-embperl_FreeConfData(pConf)
- tConf * pConf
-CODE:
- FreeConfData(pConf) ;
- RETVAL = 1 ;
-OUTPUT:
- RETVAL
-
-
-
-# /* ----- Request data ----- */
-
-tReq *
-embperl_SetupRequest(req_rec,sInputfile,mtime,filesize,nFirstLine,sOutputfile,pConf,nIOtype,pIn,pOut,sSubName,sImport,nSessionMgnt,pTokenTable)
- SV * req_rec
- char * sInputfile
- double mtime
- long filesize
- int nFirstLine
- char * sOutputfile = NO_INIT
- tConf * pConf
- int nIOtype
- SV * pIn
- SV * pOut
- char * sSubName
- char * sImport
- int nSessionMgnt
- tTokenTable * pTokenTable ;
-INIT:
- if (SvOK(ST(5)))
- sOutputfile = SvPV(ST(5), na);
- else
- sOutputfile = "\1" ;
-CODE:
- RETVAL =
SetupRequest(req_rec,sInputfile,mtime,filesize,nFirstLine,sOutputfile,pConf,nIOtype,pIn,pOut,sSubName,sImport,nSessionMgnt,pTokenTable)
;
-OUTPUT:
- RETVAL
-
+#if 0
tReq *
embperl_CurrReq()
CODE:
@@ -160,7 +88,7 @@
OUTPUT:
RETVAL
-
+#endif
double
@@ -175,19 +103,6 @@
RETVAL
-void
-embperl_GetPackageOfFile(sSourcefile, sPackage, mtime, bEP1Compat)
- char * sSourcefile
- char * sPackage
- double mtime
- int bEP1Compat
-PPCODE:
- tFile * pFile = GetFileData (sSourcefile, sPackage, mtime, bEP1Compat) ;
- EXTEND(SP,2) ;
- PUSHs(sv_2mortal(newSViv(pFile -> mtime == -1?1:0))) ;
- PUSHs(sv_2mortal(newSVpv(pFile -> sCurrPackage, pFile -> nCurrPackage))) ;
-
-
void
@@ -234,8 +149,7 @@
INIT:
tReq * r = CurrReq ;
CODE:
- OpenLog (r,"", 2) ;
- lwrite (r,sText, strlen (sText)) ;
+ lwrite (r->pApp,sText, strlen (sText)) ;
void
@@ -245,40 +159,14 @@
STRLEN l ;
tReq * r = CurrReq ;
CODE:
-#ifdef EP2
- if (!r->bEP1Compat)
{
char * p = SvPV (sText, l) ;
- /*if Node_self(DomTree_self (r -> xCurrDomTree), r -> xCurrNode) -> nType
== ntypDocumentFraq)
- Node_appendChild (DomTree_self (r -> xCurrDomTree), r -> xCurrNode, r
-> nCurrRepeatLevel, ntypCDATA, 0, p, l, 0, 0, NULL) ;
+ /*if Node_self(DomTree_self (r -> Component.xCurrDomTree), r ->
Component.xCurrNode) -> nType == ntypDocumentFraq)
+ Node_appendChild (DomTree_self (r -> Component.xCurrDomTree), r ->
Component.xCurrNode, r -> Component.nCurrRepeatLevel, ntypCDATA, 0, p, l, 0, 0, NULL)
;
else*/
- r -> xCurrNode = Node_insertAfter_CDATA (p, l, (r -> nCurrEscMode & 3)==
3?1 + (r -> nCurrEscMode & 4):r -> nCurrEscMode, DomTree_self (r -> xCurrDomTree), r
-> xCurrNode, r -> nCurrRepeatLevel) ;
+ r -> Component.xCurrNode = Node_insertAfter_CDATA (r->pApp, p, l, (r ->
Component.nCurrEscMode & 3)== 3?1 + (r -> Component.nCurrEscMode & 4):r ->
Component.nCurrEscMode, DomTree_self (r -> Component.xCurrDomTree), r ->
Component.xCurrNode, r -> Component.nCurrRepeatLevel) ;
}
- else
-#endif
- if (r -> pCurrEscape == NULL)
- {
- char * p = SvPV (sText, l) ;
- owrite (r, p, l) ;
- }
- else
- OutputToHtml (r, SvPV (sText, l)) ;
-
-
-void
-embperl_logevalerr(sText)
- char * sText
-PREINIT:
- int l ;
- tReq * r = CurrReq ;
-CODE:
- l = strlen (sText) ;
- while (l > 0 && isspace(sText[l-1]))
- sText[--l] = '\0' ;
-
- strncpy (r -> errdat1, sText, sizeof (r -> errdat1) - 1) ;
- LogError (r, rcEvalErr) ;
int
@@ -293,10 +181,8 @@
void
embperl_flushlog()
-INIT:
- tReq * r = CurrReq ;
CODE:
- FlushLog (r) ;
+ FlushLog (CurrApp) ;
char *
@@ -304,58 +190,11 @@
INIT:
tReq * r = CurrReq ;
CODE:
- if (r -> Buf.pFile)
- RETVAL = r -> Buf.pFile -> sSourcefile ;
- else
- RETVAL = NULL ;
-OUTPUT:
- RETVAL
-
-
-int
-embperl_GetInputData_CGIScript(...)
-INIT:
- tReq * r = CurrReq ;
-#ifdef APACHE
- request_rec * req_rec ;
-#endif
- SV * rsv ;
-CODE:
-#ifdef APACHE
- if (items > 0)
- {
- req_rec = r -> pApacheReq ;
- rsv = r -> pApacheReqSV ;
- if (SvROK (ST(0)))
- r -> pApacheReq = (request_rec *)SvIV((SV*)SvRV(ST(0)));
- else
- r -> pApacheReq = NULL ;
- r -> pApacheReqSV = ST(0) ;
- }
-#endif
- RETVAL = GetInputData_CGIScript (r) ;
-#ifdef APACHE
- if (items > 0)
- {
- r -> pApacheReq = req_rec ;
- r -> pApacheReqSV = rsv ;
- }
-#endif
+ RETVAL = r -> Component.sSourcefile ;
OUTPUT:
RETVAL
-int
-embperl_ProcessSub(pFile, nBlockStart, nBlockNo)
- IV pFile
- int nBlockStart
- int nBlockNo
-INIT:
- tReq * r = CurrReq ;
-CODE:
- RETVAL = ProcessSub(r,(tFile *)pFile, nBlockStart, nBlockNo) ;
-OUTPUT:
- RETVAL
void
embperl_exit()
@@ -373,7 +212,6 @@
sv_unmagic(ERRSV, 'U');
-#ifdef EP2
void
embperl_ClearSymtab(sPackage,bDebug)
@@ -382,24 +220,13 @@
CODE:
ClearSymtab (CurrReq, sPackage, bDebug) ;
-#endif
################################################################################
MODULE = HTML::Embperl PACKAGE = HTML::Embperl::Req PREFIX = embperl_
-char *
-embperl_CurrPackage(r)
- tReq * r
-CODE:
- if (r -> Buf.pFile)
- RETVAL = r -> Buf.pFile -> sCurrPackage ;
- else
- RETVAL = NULL ;
-OUTPUT:
- RETVAL
-
+#if 0
SV *
embperl_ExportHash(r)
tReq * r
@@ -700,6 +527,8 @@
strncpy (r -> errdat1, sText, sizeof (r -> errdat1) - 1) ;
LogError (r, rcEvalErr) ;
+#endif
+
void
embperl_logerror(r,code, sText,pApacheReqSV=NULL)
tReq * r
@@ -737,7 +566,7 @@
#endif
-
+#if 0
int
embperl_getloghandle(r)
tReq * r
@@ -756,7 +585,7 @@
OUTPUT:
RETVAL
-
+#endif
void
embperl_output(r,sText)
@@ -771,14 +600,13 @@
tReq * r
char * sText
CODE:
- OpenLog (r,"", 2) ;
- lwrite (r, sText, strlen (sText)) ;
+ lwrite (r->pApp, sText, strlen (sText)) ;
void
embperl_flushlog(r)
tReq * r
CODE:
- FlushLog (r) ;
+ FlushLog (r->pApp) ;
@@ -796,7 +624,7 @@
tReq * r
char * sText
CODE:
- lprintf (r,"[%d]MEM: %s: SVs: %d OBJs: %d\n", r->nPid, sText, sv_count,
sv_objcount) ;
+ lprintf (r->pApp,"[%d]MEM: %s: SVs: %d OBJs: %d\n", r->pThread->nPid, sText,
sv_count, sv_objcount) ;
SV *
embperl_Escape(r, str, mode)
@@ -811,40 +639,10 @@
OUTPUT:
RETVAL
-
-int
-embperl_ExecuteReq(r, param)
- tReq * r
- AV * param = NO_INIT
-CODE:
- param = param ; /* avoid warning */
- RETVAL = ExecuteReq(r, ST(0)) ;
-OUTPUT:
- RETVAL
-
-
-
-
-int
-embperl_Abort(r)
- tReq * r
-CODE:
- FreeRequest(r) ;
- RETVAL = 0 ;
-OUTPUT:
- RETVAL
-
-
-
-
-void
-embperl_FreeRequest(r)
- tReq * r
-CODE:
- FreeRequest(r) ;
+
-#ifdef EP2
+#if 0
char *
@@ -882,7 +680,7 @@
/*if (RETVAL != &sv_undef)
sv_2mortal(ST(0));*/
-
+#endif
INCLUDE: Cmd.xs
@@ -891,7 +689,6 @@
INCLUDE: Syntax.xs
-#endif
# Reset Module, so we get the correct boot function
1.1.2.7 +4 -4 embperl/Syntax.xs
Index: Syntax.xs
===================================================================
RCS file: /home/cvs/embperl/Syntax.xs,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- Syntax.xs 23 Mar 2001 09:28:10 -0000 1.1.2.6
+++ Syntax.xs 22 Jan 2002 15:46:22 -0000 1.1.2.7
@@ -10,13 +10,13 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Syntax.xs,v 1.1.2.6 2001/03/23 09:28:10 richter Exp $
+# $Id: Syntax.xs,v 1.1.2.7 2002/01/22 15:46:22 richter Exp $
#
###################################################################################
-MODULE = HTML::Embperl PACKAGE = HTML::Embperl::Syntax PREFIX = embperl_
+MODULE = Embperl PACKAGE = Embperl::Syntax PREFIX = embperl_
void
@@ -52,6 +52,6 @@
if (ppSV == NULL || *ppSV == NULL || !SvROK (*ppSV))
croak ("Internal Error: pSyntaxObj has no -root") ;
else
- if ((rc = BuildTokenTable (pCurrReq, 0, sName, (HV *)(SvRV(*ppSV)), "", NULL,
pTab)) != ok)
- LogError (pCurrReq, rc) ;
+ if ((rc = BuildTokenTable (CurrReq, 0, sName, (HV *)(SvRV(*ppSV)), "", NULL,
pTab)) != ok)
+ LogError (CurrReq, rc) ;
1.1.2.13 +7 -3 embperl/Attic/epinit.c
Index: epinit.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epinit.c,v
retrieving revision 1.1.2.12
retrieving revision 1.1.2.13
diff -u -r1.1.2.12 -r1.1.2.13
--- epinit.c 22 Jan 2002 09:29:54 -0000 1.1.2.12
+++ epinit.c 22 Jan 2002 15:46:22 -0000 1.1.2.13
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epinit.c,v 1.1.2.12 2002/01/22 09:29:54 richter Exp $
+# $Id: epinit.c,v 1.1.2.13 2002/01/22 15:46:22 richter Exp $
#
###################################################################################*/
@@ -945,6 +945,9 @@
embperl_SetupFormData (r) ;
+ pThread -> pCurrReq = r ;
+ pApp -> pCurrReq = r ;
+
*ppReq = r ;
return ok ;
@@ -1069,11 +1072,12 @@
char code[40] ;
SV * pSVImport ;
char * sImport ;
+ STRLEN l ;
sprintf (code, "caller(%d)", c -> Param.nImport>0?c -> Param.nImport:0) ;
/* there is no c api to the caller function, eval it... */
- pSVImport = eval_pv(code, 0) ;
- sImport = SvPV_nolen (pSVImport) ;
+ pSVImport = perl_eval_pv(code, 0) ;
+ sImport = SvPV (pSVImport, l) ;
if ((c -> pImportStash = gv_stashpv (sImport, 0)) == NULL)
{
1.1.2.21 +2 -2 embperl/Attic/epprovider.c
Index: epprovider.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epprovider.c,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -r1.1.2.20 -r1.1.2.21
--- epprovider.c 22 Jan 2002 09:29:54 -0000 1.1.2.20
+++ epprovider.c 22 Jan 2002 15:46:22 -0000 1.1.2.21
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epprovider.c,v 1.1.2.20 2002/01/22 09:29:54 richter Exp $
+# $Id: epprovider.c,v 1.1.2.21 2002/01/22 15:46:22 richter Exp $
#
###################################################################################*/
@@ -836,7 +836,7 @@
if ((rc = Provider_NewDependOne (r, sizeof(tProviderEpParse), "source", pItem,
pProviderClass, pParam)) != ok)
return rc ;
- pSyntaxPV = sv_2mortal(newSVpv (sSyntax, 0)) ;
+ pSyntaxPV = sv_2mortal(newSVpv ((char *)sSyntax, 0)) ;
PUSHMARK(sp);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
