richter 00/09/12 01:55:43
Modified: . Tag: Embperl2 embpcgi.bat embpcgi.pl
embpcgi.test.bat embpcgi.test.pl embpexec.bat
embpexec.pl ep.h epcomp.c epdat.h epdom.h epmain.c
epparse.c
Log:
- Embperl 2 - some cleanup
Revision Changes Path
No revision
No revision
1.7.2.16 +2 -2 embperl/Attic/embpcgi.bat
Index: embpcgi.bat
===================================================================
RCS file: /home/cvs/embperl/Attic/embpcgi.bat,v
retrieving revision 1.7.2.15
retrieving revision 1.7.2.16
diff -u -r1.7.2.15 -r1.7.2.16
--- embpcgi.bat 2000/07/07 15:39:35 1.7.2.15
+++ embpcgi.bat 2000/09/12 08:55:34 1.7.2.16
@@ -1,9 +1,9 @@
@rem = '--*-Perl-*--
@echo off
-/usr/bin/perl -x %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
+D:\Perl\5.00502\bin\MSWin32-x86\perl -x %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
goto endofperl
@rem ';
-#!/usr/bin/perl --
+#!D:\Perl\5.00502\bin\MSWin32-x86\perl --
#line 8
###################################################################################
#
1.7.2.16 +1 -1 embperl/Attic/embpcgi.pl
Index: embpcgi.pl
===================================================================
RCS file: /home/cvs/embperl/Attic/embpcgi.pl,v
retrieving revision 1.7.2.15
retrieving revision 1.7.2.16
diff -u -r1.7.2.15 -r1.7.2.16
--- embpcgi.pl 2000/07/07 15:39:36 1.7.2.15
+++ embpcgi.pl 2000/09/12 08:55:34 1.7.2.16
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!D:\Perl\5.00502\bin\MSWin32-x86\perl
###################################################################################
#
# Embperl - Copyright (c) 1997-1999 Gerald Richter / ECOS
1.5.2.17 +2 -2 embperl/Attic/embpcgi.test.bat
Index: embpcgi.test.bat
===================================================================
RCS file: /home/cvs/embperl/Attic/embpcgi.test.bat,v
retrieving revision 1.5.2.16
retrieving revision 1.5.2.17
diff -u -r1.5.2.16 -r1.5.2.17
--- embpcgi.test.bat 2000/07/07 15:39:36 1.5.2.16
+++ embpcgi.test.bat 2000/09/12 08:55:34 1.5.2.17
@@ -1,9 +1,9 @@
@rem = '--*-Perl-*--
@echo off
-/usr/bin/perl -x -T %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
+D:\Perl\5.00502\bin\MSWin32-x86\perl -x -T %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
goto endofperl
@rem ';
-#!/usr/bin/perl --
+#!D:\Perl\5.00502\bin\MSWin32-x86\perl --
#line 8
###################################################################################
#
1.7.2.17 +1 -1 embperl/Attic/embpcgi.test.pl
Index: embpcgi.test.pl
===================================================================
RCS file: /home/cvs/embperl/Attic/embpcgi.test.pl,v
retrieving revision 1.7.2.16
retrieving revision 1.7.2.17
diff -u -r1.7.2.16 -r1.7.2.17
--- embpcgi.test.pl 2000/07/07 15:39:37 1.7.2.16
+++ embpcgi.test.pl 2000/09/12 08:55:35 1.7.2.17
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!D:\Perl\5.00502\bin\MSWin32-x86\perl
###################################################################################
#
# Embperl - Copyright (c) 1997-1999 Gerald Richter / ECOS
1.18.2.16 +2 -2 embperl/Attic/embpexec.bat
Index: embpexec.bat
===================================================================
RCS file: /home/cvs/embperl/Attic/embpexec.bat,v
retrieving revision 1.18.2.15
retrieving revision 1.18.2.16
diff -u -r1.18.2.15 -r1.18.2.16
--- embpexec.bat 2000/07/07 15:39:37 1.18.2.15
+++ embpexec.bat 2000/09/12 08:55:35 1.18.2.16
@@ -1,9 +1,9 @@
@rem = '--*-Perl-*--
@echo off
-/usr/bin/perl -x %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
+D:\Perl\5.00502\bin\MSWin32-x86\perl -x %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
goto endofperl
@rem ';
-#!/usr/bin/perl --
+#!D:\Perl\5.00502\bin\MSWin32-x86\perl --
#line 8
###################################################################################
#
1.18.2.16 +1 -1 embperl/Attic/embpexec.pl
Index: embpexec.pl
===================================================================
RCS file: /home/cvs/embperl/Attic/embpexec.pl,v
retrieving revision 1.18.2.15
retrieving revision 1.18.2.16
diff -u -r1.18.2.15 -r1.18.2.16
--- embpexec.pl 2000/07/07 15:39:37 1.18.2.15
+++ embpexec.pl 2000/09/12 08:55:35 1.18.2.16
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!D:\Perl\5.00502\bin\MSWin32-x86\perl
###################################################################################
#
# Embperl - Copyright (c) 1997-1999 Gerald Richter / ECOS
1.23.2.11 +2 -1 embperl/ep.h
Index: ep.h
===================================================================
RCS file: /home/cvs/embperl/ep.h,v
retrieving revision 1.23.2.10
retrieving revision 1.23.2.11
diff -u -r1.23.2.10 -r1.23.2.11
--- ep.h 2000/06/27 05:31:36 1.23.2.10
+++ ep.h 2000/09/12 08:55:35 1.23.2.11
@@ -563,7 +563,8 @@
int embperl_CompileInitItem (/*i/o*/ register req * r,
/*in*/ HV * pHash,
/*in*/ int nNodeName,
- /*in*/ int nNodeType) ;
+ /*in*/ int nNodeType,
+ /*in*/ int nTagSet) ;
int embperl_CompileDocument (/*i/o*/ register req * r) ;
1.1.2.43 +24 -9 embperl/Attic/epcomp.c
Index: epcomp.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcomp.c,v
retrieving revision 1.1.2.42
retrieving revision 1.1.2.43
diff -u -r1.1.2.42 -r1.1.2.43
--- epcomp.c 2000/07/26 07:33:36 1.1.2.42
+++ epcomp.c 2000/09/12 08:55:35 1.1.2.43
@@ -78,7 +78,8 @@
int embperl_CompileInitItem (/*i/o*/ register req * r,
/*in*/ HV * pHash,
/*in*/ int nNodeName,
- /*in*/ int nNodeType)
+ /*in*/ int nNodeType,
+ /*in*/ int nTagSet)
{
SV * * ppSV ;
@@ -94,14 +95,24 @@
if (pCmd -> bValid)
{
tEmbperlCmd * pNewCmd ;
+ if (pCmd -> bValid == nTagSet)
+ return ok ;
+
while (pCmd -> pNext)
+ {
+ if (pCmd -> bValid == nTagSet)
+ return ok ;
pCmd = pCmd -> pNext ;
-
+ }
+
+ if (pCmd -> bValid == nTagSet)
+ return ok ;
+
pNewCmd = malloc (sizeof (*pNewCmd)) ;
pCmd -> pNext = pNewCmd ;
pCmd = pNewCmd ;
}
- pCmd -> bValid = 1 ;
+ pCmd -> bValid = nTagSet ;
ppSV = hv_fetch(pHash, "perlcode", 8, 0) ;
if (ppSV != NULL && *ppSV != NULL &&
@@ -954,7 +965,8 @@
/*in*/ tDomTree * pDomTree,
/*in*/ tNodeData * pNode,
/*in*/ tEmbperlCmd * pCmd,
- /*in*/ int nStartCodeOffset)
+ /*in*/ int nStartCodeOffset,
+ /*i/o*/ int * bCheckpointPending)
{
@@ -1049,6 +1061,7 @@
tNode xChildNode ;
tStringIndex nNdx ;
tEmbperlCmd * pCmd ;
+ tEmbperlCmd * pCmdHead ;
tNodeData * pNode = Node_self (pDomTree, xNode) ;
tAttrData * pAttr ;
int nAttr = 0 ;
@@ -1087,7 +1100,7 @@
// pCmd = NULL ;
}
else
- pCmd = NULL ;
+ pCmd = pCmdHead = NULL ;
if (pCmd && pCmd -> nSwitchCodeType == 2)
pProg = &pProgDef ;
@@ -1114,14 +1127,15 @@
while (pCmd)
{
- if ((rc = embperl_compileCmd (r, pDomTree, pNode, pCmd, nStartCodeOffset,
bCheckPointPending) != ok)
+ if ((rc = embperl_CompileCmd (r, pDomTree, pNode, pCmd, &nStartCodeOffset)) !=
ok)
return rc ;
pCmd = pCmd -> pNext ;
}
pCmd = pCmdHead ;
- if ((rc = embperl_compilePostProcess (r, pDomTree, pNode, pCmd,
nCheckPointCodeOffset, bCheckPointPending) != ok)
- return rc ;
+ if (pCmd)
+ if ((rc = embperl_CompilePostProcess (r, pDomTree, pNode, pCmd,
nCheckpointCodeOffset, bCheckpointPending)) != ok)
+ return rc ;
if (pCmd == NULL || pCmd -> bCompileChilds)
@@ -1140,7 +1154,7 @@
while (pCmd)
{
- if ((rc = embperl_compileCmdEnd (r, pDomTree, pNode, pCmd, nStartCodeOffset,
bCheckPointPending) != ok)
+ if ((rc = embperl_CompileCmdEnd (r, pDomTree, pNode, pCmd, nStartCodeOffset,
bCheckpointPending)) != ok)
return rc ;
pCmd = pCmd -> pNext ;
}
@@ -1204,6 +1218,7 @@
clock_t cl3 ;
clock_t cl4 ;
STRLEN l ;
+ tProcessor * pProcessor = NULL ;
tainted = 0 ;
1.17.2.8 +4 -3 embperl/epdat.h
Index: epdat.h
===================================================================
RCS file: /home/cvs/embperl/epdat.h,v
retrieving revision 1.17.2.7
retrieving revision 1.17.2.8
diff -u -r1.17.2.7 -r1.17.2.8
--- epdat.h 2000/07/26 07:33:36 1.17.2.7
+++ epdat.h 2000/09/12 08:55:36 1.17.2.8
@@ -20,9 +20,10 @@
/*-----------------------------------------------------------------*/
-typedef struct tProc
+typedef struct tProcessor
{
- int (* pCompiler)(tReq *, tDomTree *, tNode)
+ int (* pCompiler)(tReq *, tDomTree *, tNode) ;
+ } tProcessor ;
@@ -50,7 +51,7 @@
char * pOpenBracket ;
char * pCloseBracket ;
bool bEP1Compat ; /* run in Embperl 1.x compatible mode */
- tProc ** pProcessor ; /* [array] processors used to process the file */
+ tProcessor ** pProcessor ; /* [array] processors used to process the file */
char ** sExpiresKey ; /* [array] Key used to store expires setting */
double * nExpiresAt ; /* [array] Data expiers at */
SV ** pExpiresCV ; /* [array] sub that is called to determinate expiration
*/
1.1.2.32 +6 -0 embperl/Attic/epdom.h
Index: epdom.h
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.h,v
retrieving revision 1.1.2.31
retrieving revision 1.1.2.32
diff -u -r1.1.2.31 -r1.1.2.32
--- epdom.h 2000/07/06 06:17:40 1.1.2.31
+++ epdom.h 2000/09/12 08:55:36 1.1.2.32
@@ -233,6 +233,7 @@
int DomTree_delete (tDomTree * pDomTree) ;
void DomTree_checkpoint (tIndex xDomTree, tNode xChild) ;
+void DomTree_selfCheckpoint (tDomTree * pDomTree, tNode xFromNode, tNode xToNode) ;
int DomTree_selfDiscardAfterCheckpoint (/*in*/ tDomTree * pDomTree,
/*in*/ tNodeData * pNode,
@@ -295,6 +296,11 @@
tNodeData * Node_selfCloneNode (/*in*/ tDomTree * pDomTree,
/*in*/ tNodeData * pNode,
/*in*/ int bDeep) ;
+
+tNode Node_cloneNode (/*in*/ tDomTree * pDomTree,
+ /*in*/ tNode xNode,
+ /*in*/ int bDeep) ;
+
void Node_toString (/*in*/ tDomTree * pDomTree,
/*i/o*/ register req * r,
1.65.2.18 +5 -0 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.65.2.17
retrieving revision 1.65.2.18
diff -u -r1.65.2.17 -r1.65.2.18
--- epmain.c 2000/07/07 15:39:38 1.65.2.17
+++ epmain.c 2000/09/12 08:55:36 1.65.2.18
@@ -1637,6 +1637,7 @@
pConf -> sCookieExpires = sstrdup (GetHashValueStr (pReqInfo, "cookie_expires",
"")) ; /* cookie expiration time */
pConf -> sCookieDomain = sstrdup (GetHashValueStr (pReqInfo, "cookie_domain",
"")) ; ; /* domain patter for which the cookie should be returned */
pConf -> sCookiePath = sstrdup (GetHashValueStr (pReqInfo, "cookie_path",
"")) ; ; /* path to which cookie should be returned */
+ /* ##ep2##
pConf -> sExpiresKey = sstrdup (GetHashValueStr (pReqInfo, "expires_key",
pCurrReq -> pConf?pCurrReq -> pConf -> sExpiresKey:NULL)) ; ;
pConf -> nExpiresAt = 0 ;
@@ -1647,6 +1648,10 @@
pConf -> pExpiresCV = pSV ;
else if (ppSV && *ppSV)
pConf -> nExpiresAt = SvNV (*ppSV) ;
+ */
+ pConf -> sExpiresKey = NULL ;
+ pConf -> nExpiresAt = 0 ;
+ pConf -> pExpiresCV = NULL ;
pConf -> cMultFieldSep = '\t' ;
pConf -> pOpenBracket = "[*" ;
1.1.2.31 +1 -1 embperl/Attic/epparse.c
Index: epparse.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epparse.c,v
retrieving revision 1.1.2.30
retrieving revision 1.1.2.31
diff -u -r1.1.2.30 -r1.1.2.31
--- epparse.c 2000/07/07 10:07:58 1.1.2.30
+++ epparse.c 2000/09/12 08:55:37 1.1.2.31
@@ -136,7 +136,7 @@
}
if (strcmp (pKey, "embperl") == 0)
- embperl_CompileInitItem (r, (HV *)(SvRV (pSVValue)), pToken ->
nNodeName, pToken -> nNodeType) ;
+ embperl_CompileInitItem (r, (HV *)(SvRV (pSVValue)), pToken ->
nNodeName, pToken -> nNodeType, 1) ;
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
