richter 00/06/05 06:56:07
Modified: . Tag: Embperl2 Embperl.pm Embperl.xs Makefile.PL
embpcgi.bat embpcgi.pl embpcgi.test.bat
embpcgi.test.pl embpexec.bat embpexec.pl epdat.h
epdom.c epdom.h epmain.c epparse.c
Embperl Tag: Embperl2 Syntax.pm
test/html Tag: Embperl2 include.htm
Log:
Embperl 2 - Execute
Revision Changes Path
No revision
No revision
1.104.2.7 +2 -1 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.104.2.6
retrieving revision 1.104.2.7
diff -u -r1.104.2.6 -r1.104.2.7
--- Embperl.pm 2000/06/05 10:06:54 1.104.2.6
+++ Embperl.pm 2000/06/05 13:55:56 1.104.2.7
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: Embperl.pm,v 1.104.2.6 2000/06/05 10:06:54 richter Exp $
+# $Id: Embperl.pm,v 1.104.2.7 2000/06/05 13:55:56 richter Exp $
#
###################################################################################
@@ -1612,6 +1612,7 @@
*{"$package\:\:tabmode"} = \$HTML::Embperl::tabmode ;
*{"$package\:\:escmode"} = \$HTML::Embperl::escmode ;
*{"$package\:\:http_headers_out"} = \%HTML::Embperl::http_headers_out ;
+ *{"$package\:\:_ep_node"} = \$HTML::Embperl::_ep_node ;
*{"$package\:\:req_rec"} = \$HTML::Embperl::req_rec if defined
($HTML::Embperl::req_rec) ;
if (defined (&Apache::exit))
{
1.26.2.17 +1 -0 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.26.2.16
retrieving revision 1.26.2.17
diff -u -r1.26.2.16 -r1.26.2.17
--- Embperl.xs 2000/06/05 07:22:54 1.26.2.16
+++ Embperl.xs 2000/06/05 13:55:57 1.26.2.17
@@ -810,6 +810,7 @@
Attr_selfValue (pDomTree, Attr_self(pDomTree, xAttr), &sAttrText) ;
RETVAL = newSVpvn (sAttrText, ArrayGetSize (sAttrText)) ;
+ StringFree (&sAttrText) ;
OUTPUT:
RETVAL
1.28.2.8 +1 -1 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.28.2.7
retrieving revision 1.28.2.8
diff -u -r1.28.2.7 -r1.28.2.8
--- Makefile.PL 2000/06/05 10:06:54 1.28.2.7
+++ Makefile.PL 2000/06/05 13:55:57 1.28.2.8
@@ -290,7 +290,7 @@
if ($win32)
{
$ccdebug = '-Zi -W3' ;
- $lddebug = '-debug' ;
+ $lddebug = '-debug -map -profile' ;
}
else
{
1.7.2.3 +2 -2 embperl/embpcgi.bat
Index: embpcgi.bat
===================================================================
RCS file: /home/cvs/embperl/embpcgi.bat,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- embpcgi.bat 2000/06/05 07:22:54 1.7.2.2
+++ embpcgi.bat 2000/06/05 13:55:58 1.7.2.3
@@ -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.3 +1 -1 embperl/embpcgi.pl
Index: embpcgi.pl
===================================================================
RCS file: /home/cvs/embperl/embpcgi.pl,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- embpcgi.pl 2000/06/05 07:22:54 1.7.2.2
+++ embpcgi.pl 2000/06/05 13:55:58 1.7.2.3
@@ -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.3 +2 -2 embperl/embpcgi.test.bat
Index: embpcgi.test.bat
===================================================================
RCS file: /home/cvs/embperl/embpcgi.test.bat,v
retrieving revision 1.5.2.2
retrieving revision 1.5.2.3
diff -u -r1.5.2.2 -r1.5.2.3
--- embpcgi.test.bat 2000/06/05 07:22:54 1.5.2.2
+++ embpcgi.test.bat 2000/06/05 13:55:58 1.5.2.3
@@ -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.3 +1 -1 embperl/embpcgi.test.pl
Index: embpcgi.test.pl
===================================================================
RCS file: /home/cvs/embperl/embpcgi.test.pl,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -r1.7.2.2 -r1.7.2.3
--- embpcgi.test.pl 2000/06/05 07:22:54 1.7.2.2
+++ embpcgi.test.pl 2000/06/05 13:55:58 1.7.2.3
@@ -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.3 +2 -2 embperl/embpexec.bat
Index: embpexec.bat
===================================================================
RCS file: /home/cvs/embperl/embpexec.bat,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -u -r1.18.2.2 -r1.18.2.3
--- embpexec.bat 2000/06/05 07:22:54 1.18.2.2
+++ embpexec.bat 2000/06/05 13:56:01 1.18.2.3
@@ -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.3 +1 -1 embperl/embpexec.pl
Index: embpexec.pl
===================================================================
RCS file: /home/cvs/embperl/embpexec.pl,v
retrieving revision 1.18.2.2
retrieving revision 1.18.2.3
diff -u -r1.18.2.2 -r1.18.2.3
--- embpexec.pl 2000/06/05 07:22:54 1.18.2.2
+++ embpexec.pl 2000/06/05 13:56:01 1.18.2.3
@@ -1,4 +1,4 @@
-#!/usr/bin/perl
+#!D:\Perl\5.00502\bin\MSWin32-x86\perl
###################################################################################
#
# Embperl - Copyright (c) 1997-1999 Gerald Richter / ECOS
1.17.2.3 +1 -0 embperl/epdat.h
Index: epdat.h
===================================================================
RCS file: /home/cvs/embperl/epdat.h,v
retrieving revision 1.17.2.2
retrieving revision 1.17.2.3
diff -u -r1.17.2.2 -r1.17.2.3
--- epdat.h 2000/05/16 12:44:20 1.17.2.2
+++ epdat.h 2000/06/05 13:56:02 1.17.2.3
@@ -262,6 +262,7 @@
tNode xDocument ;
+ tNode xCurrNode ;
tIndex xCurrDomTree ;
tDomTree * pCurrDomTree ;
struct tTokenTable * pTokenTable ;
1.1.2.27 +33 -0 embperl/Attic/epdom.c
Index: epdom.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.c,v
retrieving revision 1.1.2.26
retrieving revision 1.1.2.27
diff -u -r1.1.2.26 -r1.1.2.27
--- epdom.c 2000/06/05 06:44:05 1.1.2.26
+++ epdom.c 2000/06/05 13:56:03 1.1.2.27
@@ -677,6 +677,7 @@
pChilds -> xNext = 0 ;
pChilds -> xPrev = 0 ;
pChilds -> xLast = 0 ;
+ pChilds -> xDomTree = pDomTree -> xNdx ;
numPads++ ;
@@ -769,6 +770,8 @@
+
+
/* ------------------------------------------------------------------------ */
/* */
/* Node_appendChild */
@@ -1013,6 +1016,30 @@
+tNode Node_replaceChildWithNode (/*in*/ tDomTree * pParentDomTree,
+ /*in*/ tNode xParent,
+ /*in*/ tDomTree * pChildDomTree,
+ /*in*/ tNode xChild)
+
+ {
+ tNodeData * pParent = Node_self (pParentDomTree, xParent) ;
+ tNodeData * pChild = Node_self (pChildDomTree, xChild) ;
+
+ pParent -> bFlags |= nflgIgnore ;
+ pParent -> xChilds = Node_selfPad (pChild) -> xNdx ;
+
+ return xChild ;
+ }
+
+
+/* ------------------------------------------------------------------------ */
+/* */
+/* Node_replaceChild */
+/* */
+/* Replace child node */
+/* */
+/* ------------------------------------------------------------------------ */
+
tNode Node_replaceChildWithCDATA (/*in*/ tDomTree * pDomTree,
/*in*/ tNode xNode,
/*in*/ tNode xOldChild,
@@ -1274,6 +1301,12 @@
tNodeData * pLastStartTag = NULL ;
struct tNodeData * pNode = Node_self (pDomTree, xNode) ;
+
+ if (pNode -> nType == ntypDocumentFraq)
+ {
+ Node_toString (DomTree_self (Node_selfPad(pNode) -> xDomTree), r, pNode ->
xNdx) ;
+ return ;
+ }
pNode = Node_selfFirstChild (pDomTree, pNode) ;
1.1.2.21 +25 -9 embperl/Attic/epdom.h
Index: epdom.h
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.h,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -r1.1.2.20 -r1.1.2.21
--- epdom.h 2000/06/01 06:38:13 1.1.2.20
+++ epdom.h 2000/06/05 13:56:03 1.1.2.21
@@ -47,6 +47,7 @@
tIndex xNext ;
tIndex xLast ;
tIndex xFirst ;
+ tIndex xDomTree ;
tUInt16 numChilds ;
tUInt16 nFill ;
tUInt16 nMax ;
@@ -105,15 +106,23 @@
enum tNodeType
{
- ntypPad = -1,
- ntypTag = 1,
- ntypStartTag = 1 + 0x20,
- ntypEndTag = 1 + 0x40,
- ntypEndStartTag = 1 + 0x60,
- ntypAttr = 2,
- ntypAttrValue = 2 + 0x20,
- ntypText = 3,
- ntypCDATA = 4,
+ ntypPad = -1,
+ ntypTag = 1,
+ ntypStartTag = 1 + 0x20,
+ ntypEndTag = 1 + 0x40,
+ ntypEndStartTag = 1 + 0x60,
+ ntypAttr = 2,
+ ntypAttrValue = 2 + 0x20,
+ ntypText = 3,
+ ntypCDATA = 4,
+ ntypEntityRef = 5,
+ ntypEntity = 6,
+ ntypProcessingInstr = 7,
+ ntypComment = 8,
+ ntypDocument = 9,
+ ntypDocumentType = 10,
+ ntypDocumentFraq = 11,
+ ntypNotation = 12,
} ;
enum tNodeFlags
@@ -246,7 +255,9 @@
#define Node_selfNodeNameNdx(pNode) (pNode -> nText) ;
#define Node_selfNodeName(pNode) (Ndx2String (pNode -> nText))
#define Node_nodeName(pDomTree,pNode) (Ndx2String (Node_self
(pDomTree,xNode) -> nText))
+#define Node_selfPad(pNode) ((struct tNodePad * )(((tUInt8 *)pNode) - pNode
-> nPadOffset))
+
void Node_toString (/*in*/ tDomTree * pDomTree,
/*i/o*/ register req * r,
/*in*/ tNode xNode) ;
@@ -258,6 +269,11 @@
tNode Node_removeChild (/*in*/ tDomTree * pDomTree,
/*in*/ tNode xNode,
/*in*/ tNode xChild) ;
+
+tNode Node_replaceChildWithNode (/*in*/ tDomTree * pParentDomTree,
+ /*in*/ tNode xParent,
+ /*in*/ tDomTree * pChildDomTree,
+ /*in*/ tNode xChild) ;
tNode Node_replaceChildWithCDATA (/*in*/ tDomTree * pDomTree,
/*in*/ tNode xNode,
1.65.2.7 +8 -1 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.65.2.6
retrieving revision 1.65.2.7
diff -u -r1.65.2.6 -r1.65.2.7
--- epmain.c 2000/05/23 07:04:55 1.65.2.6
+++ epmain.c 2000/06/05 13:56:03 1.65.2.7
@@ -40,6 +40,7 @@
static char sTabMaxColName [] = "HTML::Embperl::maxcol" ;
static char sTabModeName [] = "HTML::Embperl::tabmode" ;
static char sEscModeName [] = "HTML::Embperl::escmode" ;
+static char sCurrNodeName [] = "HTML::Embperl::_ep_node" ;
static char sTokenHashName [] = "HTML::Embperl::Syntax::Default" ;
@@ -324,6 +325,7 @@
INTMG (TabMaxCol, pCurrReq -> nTabMaxCol, notused, ;)
INTMG (TabMode, pCurrReq -> nTabMode, notused, ;)
INTMG (EscMode, pCurrReq -> nEscMode, notused, NewEscMode (pCurrReq, pSV))
+INTMG (CurrNode, pCurrReq -> xCurrNode, notused, ;)
OPTMGRD (optDisableVarCleanup , pCurrReq -> bOptions) ;
OPTMG (optDisableEmbperlErrorPage, pCurrReq -> bOptions) ;
@@ -1449,6 +1451,7 @@
ADDINTMG (TabMaxCol) ;
ADDINTMG (TabMode) ;
ADDINTMG (EscMode) ;
+ ADDINTMG (CurrNode) ;
ADDOPTMG (optDisableVarCleanup ) ;
ADDOPTMG (optDisableEmbperlErrorPage) ;
@@ -2462,11 +2465,15 @@
if (r -> bAppendToMainReq)
{
tReq * l = r -> pLastReq ;
-
+ #ifdef EP2
+ if (!bError)
+ Node_replaceChildWithNode (l -> pCurrDomTree, l -> xCurrNode, r ->
pCurrDomTree, r -> xDocument) ;
+ #else
l -> pFirstBuf = r -> pFirstBuf ;
l -> pLastBuf = r -> pLastBuf ;
l -> pFreeBuf = r -> pFreeBuf ;
l -> pLastFreeBuf= r -> pLastFreeBuf ;
+ #endif
}
else
{
1.1.2.20 +1 -1 embperl/Attic/epparse.c
Index: epparse.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epparse.c,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- epparse.c 2000/06/05 06:44:05 1.1.2.19
+++ epparse.c 2000/06/05 13:56:03 1.1.2.20
@@ -677,7 +677,7 @@
if (!(xDocNode = Node_appendChild (r -> pCurrDomTree, ntypTag, 0, "attr", 3,
0, 0)))
return 1 ;
- if (!(xDocNode = Node_appendChild (r -> pCurrDomTree, ntypTag, 0, "doc", 3, 0,
0)))
+ if (!(xDocNode = Node_appendChild (r -> pCurrDomTree, r ->
bSubReq?ntypDocumentFraq:ntypDocument, 0, "doc", 3, 0, 0)))
return 1 ;
if ((rc = ParseTokens (r, &pStart, pEnd, r -> pTokenTable, "", NULL, ntypCDATA,
0, 0, "root", xDocNode, 0)) != ok)
No revision
No revision
1.1.2.20 +6 -6 embperl/Embperl/Attic/Syntax.pm
Index: Syntax.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Attic/Syntax.pm,v
retrieving revision 1.1.2.19
retrieving revision 1.1.2.20
diff -u -r1.1.2.19 -r1.1.2.20
--- Syntax.pm 2000/06/05 11:55:42 1.1.2.19
+++ Syntax.pm 2000/06/05 13:56:06 1.1.2.20
@@ -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.2.19 2000/06/05 11:55:42 richter Exp $
+# $Id: Syntax.pm,v 1.1.2.20 2000/06/05 13:56:06 richter Exp $
#
###################################################################################
@@ -110,10 +110,10 @@
'procinfo' => {
embperl => {
perlcode => [
- '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% ; }}',
- 'if (!defined (scalar(do{%#~0:$col%}))) { _ep_dcp
(%$t%,%^*htmlrow%) ; last l%^*htmlrow% ; }',
- 'if (!defined (scalar(do{%#~0:$row%}))) { _ep_dcp
(%$t%,%^*htmltable%) ; last l%^*htmltable% ; }',
- '{%#0%;}',
+ '$_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%;{%#0%;}',
],
removenode => 3,
mayjump => 1,
@@ -127,7 +127,7 @@
'unescape' => 1,
'procinfo' => {
embperl => {
- perlcode => '%#0%',
+ perlcode => '$_ep_node=%$l%;%#0%',
removenode => 3,
mayjump => 1,
compilechilds => 0,
No revision
No revision
1.6.2.1 +2 -1 embperl/test/html/include.htm
Index: include.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/include.htm,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -r1.6 -r1.6.2.1
--- include.htm 2000/03/29 07:00:42 1.6
+++ include.htm 2000/06/05 13:56:07 1.6.2.1
@@ -98,7 +98,7 @@
) ;
-]
-
+[##
<H1> 8.) Inculde a file</H1>
[- Execute ('inc.htm') -]
@@ -150,3 +150,4 @@
</body>
</html>
+##]
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
