richter 01/05/01 21:09:10
Modified: . Changes.pod epmain.c epnames.h eputil.c test.pl
test/cmp hidden.htm
test/html loop.htm loopperl.htm
test/html/EmbperlObject epodiv.htm
Log:
make test for Perl 5.7.1
Revision Changes Path
1.160 +1 -1 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -r1.159 -r1.160
--- Changes.pod 2001/04/27 07:40:22 1.159
+++ Changes.pod 2001/05/02 04:08:54 1.160
@@ -27,7 +27,7 @@
- ';' is now escaped to %3B when outputed inside a URL.
- Embperl is now added to the Serversoftware identification when
preloaded under mod_perl.
- - adapted make test to Perl 5.6.1 so now it passes sucessfully.
+ - adapted make test to Perl 5.6.1 and 5.7.1 so now it passes sucessfully.
=head1 1.3.1 (RELEASE) 13 Feb. 2001
1.98 +11 -13 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -r1.97 -r1.98
--- epmain.c 2001/04/27 06:38:01 1.97
+++ epmain.c 2001/05/02 04:08:55 1.98
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epmain.c,v 1.97 2001/04/27 06:38:01 richter Exp $
+# $Id: epmain.c,v 1.98 2001/05/02 04:08:55 richter Exp $
#
###################################################################################*/
@@ -540,8 +540,8 @@
int len = 0 ;
char sLine [1024] ;
SV * pSVE ;
- int savewarn = PL_dowarn ;
- PL_dowarn = 0 ; /* no warnings here */
+ int savewarn = dowarn ;
+ dowarn = 0 ; /* no warnings here */
EPENTRY (GetInputData_CGIProcess) ;
@@ -553,7 +553,7 @@
if ((rc = OpenInput (r, sCmdFifo)) != ok)
{
- PL_dowarn = savewarn ;
+ dowarn = savewarn ;
return rc ;
}
@@ -583,7 +583,7 @@
if (hv_store (r -> pEnvHash, sLine, strlen (sLine), pSVE, 0) == NULL)
{
- PL_dowarn = savewarn ;
+ dowarn = savewarn ;
return rcHashError ;
}
if (r -> bDebug & dbgEnv)
@@ -594,7 +594,7 @@
len = atoi (sLine) ;
if ((p = _malloc (len + 1)) == NULL)
{
- PL_dowarn = savewarn ;
+ dowarn = savewarn ;
return rcOutOfMemory ;
}
iread (p, len) ;
@@ -610,7 +610,7 @@
CloseInput () ;
- PL_dowarn = savewarn ;
+ dowarn = savewarn ;
return rc ;
}
@@ -656,8 +656,8 @@
HE * pEntry ;
char * pKey ;
I32 l ;
- int savewarn = PL_dowarn ;
- PL_dowarn = 0 ; /* no warnings here */
+ int savewarn = dowarn ;
+ dowarn = 0 ; /* no warnings here */
hv_iterinit (r -> pEnvHash) ;
while ((pEntry = hv_iternext (r -> pEnvHash)))
@@ -667,7 +667,7 @@
lprintf (r, "[%d]ENV: %s=%s\n", r -> nPid, pKey, SvPV (psv, na))
;
}
- PL_dowarn = savewarn ;
+ dowarn = savewarn ;
}
sLen [0] = '\0' ;
@@ -1547,8 +1547,6 @@
ADDINTMG (EscMode) ;
#ifdef EP2
ADDINTMG (CurrNode) ;
- //ADDINTMG (CheckpointNode) ;
- //ADDINTMG (OutputVar) ;
#endif
ADDOPTMG (optDisableVarCleanup ) ;
@@ -2715,7 +2713,7 @@
SvREFCNT_dec (pCookie) ;
}
#ifdef EP2
- if (r -> bEP1Compat) // Embperl 2 currently cannot calc Content Length
+ if (r -> bEP1Compat) /* Embperl 2 currently cannot calc Content
Length */
#endif
set_content_length (r -> pApacheReq, GetContentLength (r) + (r ->
pCurrEscape?2:0)) ;
send_http_header (r -> pApacheReq) ;
1.27 +7 -1 embperl/epnames.h
Index: epnames.h
===================================================================
RCS file: /home/cvs/embperl/epnames.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- epnames.h 2001/04/27 06:38:02 1.26
+++ epnames.h 2001/05/02 04:08:56 1.27
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epnames.h,v 1.26 2001/04/27 06:38:02 richter Exp $
+# $Id: epnames.h,v 1.27 2001/05/02 04:08:56 richter Exp $
#
###################################################################################*/
@@ -101,6 +101,9 @@
#define SetupRequest EMBPERL_SetupRequest
#define Term EMBPERL_Term
#define sstrdup EMBPERL_sstrdup
+#define strnstr EMBPERL_strnstr
+#define ClearSymtab EMBPERL_ClearSymtab
+#define UndefSub EMBPERL_UndefSub
#define _ep_memdup EMBPERL__ep_memdup
#define ProcessBlock EMBPERL_ProcessBlock
#define NewEscMode EMBPERL_NewEscMode
@@ -189,6 +192,9 @@
#endif
#ifndef warnhook
#define warnhook PL_warnhook
+#endif
+#ifndef dowarn
+#define dowarn PL_dowarn
#endif
#ifndef diehook
#define diehook PL_diehook
1.20 +2 -1 embperl/eputil.c
Index: eputil.c
===================================================================
RCS file: /home/cvs/embperl/eputil.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- eputil.c 2001/04/27 06:38:03 1.19
+++ eputil.c 2001/05/02 04:08:57 1.20
@@ -863,8 +863,8 @@
return ok ;
}
+#ifdef EP2
-
/* ------------------------------------------------------------------------- */
/* */
/* ClearSymtab */
@@ -1017,6 +1017,7 @@
}
+#endif
/* ------------------------------------------------------------------------- */
/* */
1.100 +7 -4 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -r1.99 -r1.100
--- test.pl 2001/04/27 07:40:24 1.99
+++ test.pl 2001/05/02 04:08:57 1.100
@@ -797,7 +797,7 @@
sub CmpFiles
{
my ($f1, $f2, $errin) = @_ ;
- my $line = 1 ;
+ my $line = 0 ;
my $err = 0 ;
open F1, $f1 || die "***Cannot open $f1" ;
@@ -808,9 +808,13 @@
while (defined ($l1 = <F1>))
{
- chompcr ($l1) ;
+ $line++ ;
+ chompcr ($l1) ;
while (($l1 =~ /^\s*$/) && defined ($l1 = <F1>))
- { chompcr ($l1) ; }
+ {
+ $line++ ;
+ chompcr ($l1) ;
+ }
if (!$errin)
@@ -863,7 +867,6 @@
print "\nError in Line $line\nIs:\t>$l1<\nShould:\t>$l2<\n" ;
return $line ;
}
- $line++ ;
}
if (!$errin)
1.5 +4 -4 embperl/test/cmp/hidden.htm
Index: hidden.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp/hidden.htm,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- hidden.htm 1999/10/05 06:02:07 1.4
+++ hidden.htm 2001/05/02 04:09:02 1.5
@@ -76,16 +76,16 @@
d7
<input type="hidden" name="feld2" value="Rheinhessen">
e1
-<input type="hidden" name="empty1" value="">
-<input type="hidden" name="empty2" value="">
+^<input type="hidden" name="empty(1|2)" value="">
+^<input type="hidden" name="empty(1|2)" value="">
e2
<input type="hidden" name="empty1" value="">
<input type="hidden" name="empty2" value="">
optNoHiddenEmptyValue is now 0 optNoHiddenEmptyValue is now 1 e1
e2
optNoHiddenEmptyValue is now 0 e1
-<input type="hidden" name="empty1" value="">
-<input type="hidden" name="empty2" value="">
+^<input type="hidden" name="empty(1|2)" value="">
+^<input type="hidden" name="empty(1|2)" value="">
e2
<input type="hidden" name="empty1" value="">
<input type="hidden" name="empty2" value="">
1.7 +6 -3 embperl/test/html/loop.htm
Index: loop.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/loop.htm,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- loop.htm 2000/09/14 04:57:36 1.6
+++ loop.htm 2001/05/02 04:09:04 1.7
@@ -26,7 +26,8 @@
[- %h = ('A' => 1, 'B' => 2, 'C' => 3) ; -]
[- @a = ('a', 'b', 'c', 'd') ; -]
-[$ while ($v, $k) = each (%h) $]
+[- @hh = map { $_ => $h{$_} } sort keys %h -]
+[$ while ($v = shift @hh, $k = shift @hh) $]
[+ "$v = $k" +]<br>
[$ endwhile $]
@@ -61,14 +62,16 @@
[- $i = 0 -]
[$ do $]
[+ "\@a[$i] = $a[$i]" +]<br>
- [$ while ($v, $k) = each (%h) $]
+ [- @hh = map { $_ => $h{$_} } sort keys %h -]
+ [$ while ($v = shift @hh, $k = shift @hh) $]
[+ "$v = $k" +]<br>
[$ foreach $fv (1, 3, 5, 7, 9) $]
[+ $fv +] <br>
[$ endforeach $]
[$ foreach $fv (()) $]
[+ $fv +] <br>
- [$ while ($wv, $wk) = each (%h) $]
+ [- @hhh = map { $_ => $h{$_} } sort keys %h -]
+ [$ while ($wv = shift @hhh, $wk = shift @hhh) $]
[+ "$wv = $wk" +]<br>
[$ endwhile $]
[$ endforeach $]
1.3 +6 -3 embperl/test/html/loopperl.htm
Index: loopperl.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/loopperl.htm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- loopperl.htm 1999/10/05 06:03:45 1.2
+++ loopperl.htm 2001/05/02 04:09:05 1.3
@@ -26,7 +26,8 @@
[- %h = ('A' => 1, 'B' => 2, 'C' => 3) ; -]
[- @a = ('a', 'b', 'c', 'd') ; -]
-[* while (($v, $k) = each (%h)) { *]
+[* @hh = map { $_ => $h{$_} } sort keys %h ;
+ while ($v = shift @hh, $k = shift @hh) { *]
[+ "$v = $k" +]<br>
[* } *]
@@ -57,14 +58,16 @@
[- $i = 0 -]
[* do { *]
[+ "\@a[$i] = $a[$i]" +]<br>
- [* while (($v, $k) = each (%h)) { *]
+ [* @hh = map { $_ => $h{$_} } sort keys %h ;
+ while (($v = shift @hh, $k = shift @hh)) { *]
[+ "$v = $k" +]<br>
[* foreach $fv (1, 3, 5, 7, 9) { *]
[+ $fv +] <br>
[* } *]
[* foreach $fv (1) { *]
[+ $fv +] <br>
- [* while (($wv, $wk) = each (%hhh)) { *]
+ [- @hhh = map { $_ => $h{$_} } sort keys %hhh ; -]
+ [* while (($wv = shift @hhh, $wk = shift @hhh)) { *]
[+ "$wv = $wk" +]<br>
[* } *]
[* } *]
1.3 +8 -5 embperl/test/html/EmbperlObject/epodiv.htm
Index: epodiv.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/EmbperlObject/epodiv.htm,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- epodiv.htm 2000/11/07 11:28:37 1.2
+++ epodiv.htm 2001/05/02 04:09:08 1.3
@@ -6,7 +6,7 @@
<body>
-[$ var $a $b $c $d $e $i $j $ii $v $k $fv @a %a @b %h @c @ii %hash $wv $wk $]
+[$ var $a $b $c $d $e $i $j $ii $v $k $fv @a %a @b %h @c @ii %hash $wv $wk @hh @hhh
$]
Here it starts with some HTML Text<P>
@@ -225,7 +225,8 @@
[- %h = ('A' => 1, 'B' => 2, 'C' => 3) ; -]
[- @a = ('a', 'b', 'c', 'd') ; -]
-[$ while ($v, $k) = each (%h) $]
+[- @hh = map { $_ => $h{$_} } sort keys %h -]
+[$ while ($v = shift @hh, $k = shift @hh) $]
[+ "$v = $k" +]<br>
[$ endwhile $]
@@ -258,21 +259,23 @@
[$ endforeach $]
[- %hash = ( a=>1, b=>2, c=>3) -]
-[$ foreach $v(keys %hash) $]
+[$ foreach $v(sort keys %hash) $]
3:[+ $v +] <br>
[$ endforeach $]
[- $i = 0 -]
[$ do $]
[+ "\@a[$i] = $a[$i]" +]<br>
- [$ while ($v, $k) = each (%h) $]
+ [- @hh = map { $_ => $h{$_} } sort keys %h -]
+ [$ while ($v = shift @hh, $k = shift @hh) $]
[+ "$v = $k" +]<br>
[$ foreach $fv (1, 3, 5, 7, 9) $]
[+ $fv +] <br>
[$ endforeach $]
[$ foreach $fv (()) $]
[+ $fv +] <br>
- [$ while ($wv, $wk) = each (%h) $]
+ [- @hh = map { $_ => $h{$_} } sort keys %h -]
+ [$ while ($wv = shift @hh, $wk = shift @hh) $]
[+ "$wv = $wk" +]<br>
[$ endwhile $]
[$ endforeach $]
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
