richter 00/06/11 11:58:20
Modified: . Tag: Embperl2 Embperl.pm Embperl.xs Makefile.PL
embpcgi.bat embpcgi.pl embpcgi.test.bat
embpcgi.test.pl embpexec.bat embpexec.pl epcmd2.c
epcomp.c epdom.c
Embperl Tag: Embperl2 Syntax.pm
Log:
Embperl 2 - Perl 5.004
Revision Changes Path
No revision
No revision
1.104.2.10 +3 -3 embperl/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl.pm,v
retrieving revision 1.104.2.9
retrieving revision 1.104.2.10
diff -u -r1.104.2.9 -r1.104.2.10
--- Embperl.pm 2000/06/07 04:10:38 1.104.2.9
+++ Embperl.pm 2000/06/11 18:58:12 1.104.2.10
@@ -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.9 2000/06/07 04:10:38 richter Exp $
+# $Id: Embperl.pm,v 1.104.2.10 2000/06/11 18:58:12 richter Exp $
#
###################################################################################
@@ -81,7 +81,7 @@
@ISA = qw(Exporter DynaLoader);
-$VERSION = '2.0a1';
+$VERSION = '2.0a2';
# HTML::Embperl cannot be bootstrapped in nonlazy mode except
@@ -1211,7 +1211,7 @@
$req{'req_rec'} = $req_rec ;
my @errors ;
$req{'errors'} = \@errors ;
- $req_rec -> pnotes ('EMBPERL_ERRORS', \@errors) ;
+ $req_rec -> pnotes ('EMBPERL_ERRORS', \@errors) if (defined (&Apache::pnotes)) ;
my $rc = Execute (\%req) ;
1.26.2.20 +7 -9 embperl/Embperl.xs
Index: Embperl.xs
===================================================================
RCS file: /home/cvs/embperl/Embperl.xs,v
retrieving revision 1.26.2.19
retrieving revision 1.26.2.20
diff -u -r1.26.2.19 -r1.26.2.20
--- Embperl.xs 2000/06/09 14:23:01 1.26.2.19
+++ Embperl.xs 2000/06/11 18:58:13 1.26.2.20
@@ -660,23 +660,22 @@
int xDomTree
int xOldChild
SV * sText
-CODE:
+PPCODE:
STRLEN l ;
char * s = SV2String (sText, l) ;
Node_replaceChildWithCDATA (DomTree_self(xDomTree), -1, xOldChild, s, l,
(pCurrReq -> nCurrEscMode & 3)== 3?1 + (pCurrReq -> nCurrEscMode & 4):pCurrReq ->
nCurrEscMode, nflgModified | nflgReturn) ;
pCurrReq -> nCurrEscMode = pCurrReq -> nEscMode ;
pCurrReq -> bEscModeSet = -1 ;
SvREFCNT_inc (sText) ;
- RETVAL = sText ;
-OUTPUT:
- RETVAL
+ ST(0) = sText ;
+ XSRETURN(1) ;
SV *
embperl_Node_replaceChildWithUrlDATA (xDomTree, xOldChild,sText)
int xDomTree
int xOldChild
SV * sText
-CODE:
+PPCODE:
STRLEN l ;
char * s ;
AV * pAV ;
@@ -717,9 +716,8 @@
pCurrReq -> nCurrEscMode = pCurrReq -> nEscMode ;
pCurrReq -> bEscModeSet = -1 ;
SvREFCNT_inc (sText) ;
- RETVAL = sText ;
-OUTPUT:
- RETVAL
+ ST(0) = sText ;
+ XSRETURN(1) ;
void
@@ -809,7 +807,7 @@
char * sAttrText = NULL ;
Attr_selfValue (pDomTree, Attr_self(pDomTree, xAttr), &sAttrText) ;
- RETVAL = newSVpvn (sAttrText, ArrayGetSize (sAttrText)) ;
+ RETVAL = newSVpv (sAttrText, ArrayGetSize (sAttrText)) ;
StringFree (&sAttrText) ;
OUTPUT:
RETVAL
1.28.2.9 +43 -1 embperl/Makefile.PL
Index: Makefile.PL
===================================================================
RCS file: /home/cvs/embperl/Makefile.PL,v
retrieving revision 1.28.2.8
retrieving revision 1.28.2.9
diff -u -r1.28.2.8 -r1.28.2.9
--- Makefile.PL 2000/06/05 13:55:57 1.28.2.8
+++ Makefile.PL 2000/06/11 18:58:14 1.28.2.9
@@ -95,9 +95,51 @@
$txt =~ s/PERL_DL_NONLAZY=1/PERL_DL_NONLAZY=0/ ;
#$txt =~ s/\$\(FULLPERL\)/\$\(FULLPERL\) \-T / ;
$txt =~ s/\$\(FULLPERL\)/SET PATH=\$\(PATH\)\;$EPHTTPDDLL\n\t\$\(FULLPERL\)/
if ($win32) ;
+
+ $txt =~ s/\$\(TEST_FILE\)/\$(TEST_FILE) \$(TESTARGS)/g ;
+
return $txt ;
}
+
+sub MY::test
+
+ {
+ my ($txt) = shift -> MM::test (@_) ;
+
+
+ $txt .= qq{
+
+testdbinit : pure_all
+\t\@echo set args -I\$(INST_ARCHLIB) -I\$(INST_LIB) -I\$(PERL_ARCHLIB)
-I\$(PERL_LIB) \$(TEST_FILE) \$(TESTARGS) > dbinitembperl
+
+testdbbreak : pure_all
+\t\@echo set args -I\$(INST_ARCHLIB) -I\$(INST_LIB) -I\$(PERL_ARCHLIB)
-I\$(PERL_LIB) \$(TEST_FILE) dbgbreak \$(TESTARGS) > dbinitembperl
+\t\@echo r >> dbinitembperl
+
+
+testddd : testdbinit
+\tPERL_DL_NONLAZY=0 ddd -x dbinitembperl \$(FULLPERL)
+
+testgdb : testdbinit
+\tPERL_DL_NONLAZY=0 gdb -x dbinitembperl \$(FULLPERL)
+
+testdddb : testdbbreak
+\tPERL_DL_NONLAZY=0 ddd -x dbinitembperl \$(FULLPERL)
+
+testgdbb : testdbbreak
+\tPERL_DL_NONLAZY=0 gdb -x dbinitembperl \$(FULLPERL)
+
+
+} ;
+
+ $txt =~ s/\r\n/\n/g ; # make doesn't like \r\n!
+
+ return $txt ;
+ }
+
+
+
sub MY::xs_c
{
my ($txt) = shift -> MM::xs_c (@_) ;
@@ -525,7 +567,7 @@
if ($b && $apache)
{
- $EPPORT = 8529 ;
+ $EPPORT = 8531 ;
if (!$win32)
{
$EPUSER = getpwuid($>) || $> ;
1.7.2.8 +2 -2 embperl/embpcgi.bat
Index: embpcgi.bat
===================================================================
RCS file: /home/cvs/embperl/embpcgi.bat,v
retrieving revision 1.7.2.7
retrieving revision 1.7.2.8
diff -u -r1.7.2.7 -r1.7.2.8
--- embpcgi.bat 2000/06/09 14:23:01 1.7.2.7
+++ embpcgi.bat 2000/06/11 18:58:14 1.7.2.8
@@ -1,9 +1,9 @@
@rem = '--*-Perl-*--
@echo off
-D:\Perl\5.00502\bin\MSWin32-x86\perl -x %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
+/usr/bin/perl -x %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
goto endofperl
@rem ';
-#!D:\Perl\5.00502\bin\MSWin32-x86\perl --
+#!/usr/bin/perl --
#line 8
###################################################################################
#
1.7.2.8 +1 -1 embperl/embpcgi.pl
Index: embpcgi.pl
===================================================================
RCS file: /home/cvs/embperl/embpcgi.pl,v
retrieving revision 1.7.2.7
retrieving revision 1.7.2.8
diff -u -r1.7.2.7 -r1.7.2.8
--- embpcgi.pl 2000/06/09 14:23:01 1.7.2.7
+++ embpcgi.pl 2000/06/11 18:58:14 1.7.2.8
@@ -1,4 +1,4 @@
-#!D:\Perl\5.00502\bin\MSWin32-x86\perl
+#!/usr/bin/perl
###################################################################################
#
# Embperl - Copyright (c) 1997-1999 Gerald Richter / ECOS
1.5.2.8 +2 -2 embperl/embpcgi.test.bat
Index: embpcgi.test.bat
===================================================================
RCS file: /home/cvs/embperl/embpcgi.test.bat,v
retrieving revision 1.5.2.7
retrieving revision 1.5.2.8
diff -u -r1.5.2.7 -r1.5.2.8
--- embpcgi.test.bat 2000/06/09 14:23:01 1.5.2.7
+++ embpcgi.test.bat 2000/06/11 18:58:14 1.5.2.8
@@ -1,9 +1,9 @@
@rem = '--*-Perl-*--
@echo off
-D:\Perl\5.00502\bin\MSWin32-x86\perl -x -T %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
+/usr/bin/perl -x -T %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
goto endofperl
@rem ';
-#!D:\Perl\5.00502\bin\MSWin32-x86\perl --
+#!/usr/bin/perl --
#line 8
###################################################################################
#
1.7.2.8 +1 -1 embperl/embpcgi.test.pl
Index: embpcgi.test.pl
===================================================================
RCS file: /home/cvs/embperl/embpcgi.test.pl,v
retrieving revision 1.7.2.7
retrieving revision 1.7.2.8
diff -u -r1.7.2.7 -r1.7.2.8
--- embpcgi.test.pl 2000/06/09 14:23:01 1.7.2.7
+++ embpcgi.test.pl 2000/06/11 18:58:14 1.7.2.8
@@ -1,4 +1,4 @@
-#!D:\Perl\5.00502\bin\MSWin32-x86\perl
+#!/usr/bin/perl
###################################################################################
#
# Embperl - Copyright (c) 1997-1999 Gerald Richter / ECOS
1.18.2.8 +2 -2 embperl/embpexec.bat
Index: embpexec.bat
===================================================================
RCS file: /home/cvs/embperl/embpexec.bat,v
retrieving revision 1.18.2.7
retrieving revision 1.18.2.8
diff -u -r1.18.2.7 -r1.18.2.8
--- embpexec.bat 2000/06/09 14:23:01 1.18.2.7
+++ embpexec.bat 2000/06/11 18:58:14 1.18.2.8
@@ -1,9 +1,9 @@
@rem = '--*-Perl-*--
@echo off
-D:\Perl\5.00502\bin\MSWin32-x86\perl -x %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
+/usr/bin/perl -x %0 %1 %2 %3 %4 %5 %6 %7 %8 %9
goto endofperl
@rem ';
-#!D:\Perl\5.00502\bin\MSWin32-x86\perl --
+#!/usr/bin/perl --
#line 8
###################################################################################
#
1.18.2.8 +1 -1 embperl/embpexec.pl
Index: embpexec.pl
===================================================================
RCS file: /home/cvs/embperl/embpexec.pl,v
retrieving revision 1.18.2.7
retrieving revision 1.18.2.8
diff -u -r1.18.2.7 -r1.18.2.8
--- embpexec.pl 2000/06/09 14:23:01 1.18.2.7
+++ embpexec.pl 2000/06/11 18:58:14 1.18.2.8
@@ -1,4 +1,4 @@
-#!D:\Perl\5.00502\bin\MSWin32-x86\perl
+#!/usr/bin/perl
###################################################################################
#
# Embperl - Copyright (c) 1997-1999 Gerald Richter / ECOS
1.1.2.7 +2 -2 embperl/Attic/epcmd2.c
Index: epcmd2.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcmd2.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -u -r1.1.2.6 -r1.1.2.7
--- epcmd2.c 2000/06/09 14:23:02 1.1.2.6
+++ epcmd2.c 2000/06/11 18:58:15 1.1.2.7
@@ -48,7 +48,7 @@
if (hv_exists ((HV *)pSV, (char *)pVal, nValLen))
{
bEqual = 1 ;
- hv_store (pCurrReq -> pInputHash, (char *)pName, nNameLen, newSVpvn
((char *)pVal, nValLen), 0) ;
+ hv_store (pCurrReq -> pInputHash, (char *)pName, nNameLen, newSVpv
((nValLen?((char *)pVal):""), nValLen), 0) ;
}
}
else
@@ -72,7 +72,7 @@
}
else
if (Element_selfGetAttribut (pDomTree, pNode, sAttrName, nAttrLen))
- hv_store (pCurrReq -> pInputHash, (char *)pName, nNameLen, newSVpvn ((char
*)pVal, nValLen), 0) ;
+ hv_store (pCurrReq -> pInputHash, (char *)pName, nNameLen, newSVpv
((nValLen?((char *)pVal):""), nValLen), 0) ;
}
1.1.2.29 +1 -1 embperl/Attic/epcomp.c
Index: epcomp.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcomp.c,v
retrieving revision 1.1.2.28
retrieving revision 1.1.2.29
diff -u -r1.1.2.28 -r1.1.2.29
--- epcomp.c 2000/06/09 14:23:02 1.1.2.28
+++ epcomp.c 2000/06/11 18:58:15 1.1.2.29
@@ -892,7 +892,7 @@
StringNew (&pProg, r -> Buf.pFile -> nFilesize / 4) ;
StringAdd (&pProg, "my $_ep_DomTree = $_[1];\nmy $_ep_EscMask =
5;\n*_ep_rp=\\&XML::Embperl::DOM::Node_replaceChildWithCDATA;\n*_ep_rpurl=\\&XML::Embperl::DOM::Node_replaceChildWithUrlDATA;\n*_ep_cp=\\&XML::Embperl::DOM::DomTree_checkpoint;\n
", 0) ;
- StringAdd (&pProg,
"*_ep_dcp=\\&XML::Embperl::DOM::DomTree_discardAfterCheckpoint;\n ", 0) ;
+ StringAdd (&pProg,
"*_ep_dcp=\\&XML::Embperl::DOM::DomTree_discardAfterCheckpoint;\n", 0) ;
pDomTree -> pSV = (SV *)newHV () ;
nLabelCnt = 1 ;
1.1.2.32 +3 -3 embperl/Attic/epdom.c
Index: epdom.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epdom.c,v
retrieving revision 1.1.2.31
retrieving revision 1.1.2.32
diff -u -r1.1.2.31 -r1.1.2.32
--- epdom.c 2000/06/09 14:23:02 1.1.2.31
+++ epdom.c 2000/06/11 18:58:15 1.1.2.32
@@ -356,7 +356,7 @@
pSVNdx = newSViv (nNdx) ;
SvREFCNT_inc (pSVNdx) ;
- pSVKey = newSVpvn ((char *)sText, nLen) ;
+ pSVKey = newSVpv (nLen?(char *)sText:"", nLen) ;
pHEKey = hv_store_ent (pStringTableHash, pSVKey, pSVNdx, 0) ;
pStringTableArray[nNdx] = pHEKey ;
@@ -391,14 +391,14 @@
/* NULL */
pSVNdx = newSViv (0) ;
SvREFCNT_inc (pSVNdx) ;
- pSVKey = newSVpvn ("", 0) ;
+ pSVKey = newSVpv ("", 0) ;
pHEKey = hv_store_ent (pStringTableHash, pSVKey, pSVNdx, 0) ;
pStringTableArray[0] = pHEKey ;
/* "" */
pSVNdx = newSViv (1) ;
SvREFCNT_inc (pSVNdx) ;
- pSVKey = newSVpvn ("", 0) ;
+ pSVKey = newSVpv ("", 0) ;
pHEKey = hv_store_ent (pStringTableHash, pSVKey, pSVNdx, 0) ;
pStringTableArray[1] = pHEKey ;
No revision
No revision
1.1.2.22 +4 -4 embperl/Embperl/Attic/Syntax.pm
Index: Syntax.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Attic/Syntax.pm,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- Syntax.pm 2000/06/06 10:25:36 1.1.2.21
+++ Syntax.pm 2000/06/11 18:58:18 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: Syntax.pm,v 1.1.2.21 2000/06/06 10:25:36 richter Exp $
+# $Id: Syntax.pm,v 1.1.2.22 2000/06/11 18:58:18 richter Exp $
#
###################################################################################
@@ -249,7 +249,7 @@
perlcodeend => '} %?*-htmltable%' ,
perlcoderemove => 1,
stackname => 'htmltable',
- push => '%$l%',
+ 'push' => '%$l%',
mayjump => 1,
}
) ;
@@ -315,7 +315,7 @@
perlcodeend => '} %?*-htmlrow%' ,
perlcoderemove => 1,
stackname => 'htmlrow',
- push => '%$l%',
+ 'push' => '%$l%',
mayjump => 1,
}
},
@@ -429,7 +429,7 @@
perlcodeend => '} %?*-htmltable%' ,
perlcoderemove => 1,
stackname => 'htmltable',
- push => '%$l%',
+ 'push' => '%$l%',
mayjump => 1,
}
},
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
