You are viewing a plain text version of this content. The canonical link for it is here.
Posted to embperl-cvs@perl.apache.org by ri...@apache.org on 2001/11/22 12:00:55 UTC
cvs commit: embperl/test/html sub.htm
richter 01/11/22 03:00:55
Modified: . Tag: Embperl2c Changes.pod epcomp.c test.pl
Embperl/Syntax Tag: Embperl2c RTF.pm
test/cmp2 Tag: Embperl2c tied.htm
test/html Tag: Embperl2c sub.htm
Log:
- Add require URI::URL to test.pl so make test work with newer LWP.
Patch from Jonathan Stowe.
- Fixed problem in registry/tied test, which failed for some Apache
versions because of addtional http header. Patch from Jonathan Stowe.
- Fixed problem with comments inside [! !] blocks. Reported by
Alan Milligan.
Revision Changes Path
No revision
No revision
1.129.4.37 +11 -0 embperl/Changes.pod
Index: Changes.pod
===================================================================
RCS file: /home/cvs/embperl/Changes.pod,v
retrieving revision 1.129.4.36
retrieving revision 1.129.4.37
diff -u -r1.129.4.36 -r1.129.4.37
--- Changes.pod 2001/11/20 15:15:41 1.129.4.36
+++ Changes.pod 2001/11/22 11:00:53 1.129.4.37
@@ -1,5 +1,16 @@
=pod
+=head1 2.0b5
+
+ - Add require URI::URL to test.pl so make test work with newer LWP.
+ Patch from Jonathan Stowe.
+ - Fixed problem in registry/tied test, which failed for some Apache
+ versions because of addtional http header. Patch from Jonathan Stowe.
+ - Fixed problem with comments inside [! !] blocks. Reported by
+ Alan Milligan.
+ - Fixed compiling problem with very recent versions of libxslt.
+ Reported by Michael Stevens and Jonathan Stowe.
+
=head1 2.0b4 (BETA) 20. Nov. 2001
- Enhancements for RTF syntax, allowing no IF fields and passes
1.4.2.81 +27 -17 embperl/Attic/epcomp.c
Index: epcomp.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcomp.c,v
retrieving revision 1.4.2.80
retrieving revision 1.4.2.81
diff -u -r1.4.2.80 -r1.4.2.81
--- epcomp.c 2001/11/16 11:29:02 1.4.2.80
+++ epcomp.c 2001/11/22 11:00:53 1.4.2.81
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epcomp.c,v 1.4.2.80 2001/11/16 11:29:02 richter Exp $
+# $Id: epcomp.c,v 1.4.2.81 2001/11/22 11:00:53 richter Exp $
#
###################################################################################*/
@@ -972,15 +972,20 @@
if (r -> bDebug & dbgCompile)
lprintf (r, "[%d]EPCOMP: #%d L%d CompileTimeCode: %*.*s\n", r -> nPid, pNode -> xNdx, pNode -> nLinenumber, l, l, pCTCode) ;
- while (i--)
- { /* keep everything on one line, to make linenumbers correct */
- if (*p == '\r' || *p == '\n')
- *p = ' ' ;
- p++ ;
- }
-
-
- pSV = newSVpvf("package %s ;\n#line %d \"%s\"\n%*.*s",
+ if (p[0] == '#' && p[1] == '!' && p[2] == '-')
+ {
+ p[0] = ' ' ;
+ p[1] = ' ' ;
+ p[2] = ' ' ;
+ while (i--)
+ { /* keep everything on one line, to make linenumbers correct */
+ if (*p == '\r' || *p == '\n')
+ *p = ' ' ;
+ p++ ;
+ }
+ }
+
+ pSV = newSVpvf("package %s ;\n#line %d \"%s\"\n%*.*s",
r -> Buf.sEvalPackage, pNode -> nLinenumber, sSourcefile, l,l, pCTCode) ;
newSVpvf2(pSV) ;
args[0] = r -> pReqSV ;
@@ -1206,13 +1211,18 @@
if (r -> bDebug & dbgCompile)
lprintf (r, "[%d]EPCOMP: #%d L%d CompileTimeCodeEnd: %*.*s\n", r -> nPid, pNode -> xNdx, pNode -> nLinenumber, l, l, pCTCode) ;
- while (i--)
- { /* keep everything on one line, to make linenumbers correct */
- if (*p == '\r' || *p == '\n')
- *p = ' ' ;
- p++ ;
- }
-
+ if (p[0] == '#' && p[1] == '!' && p[2] == '-')
+ {
+ p[0] = ' ' ;
+ p[1] = ' ' ;
+ p[2] = ' ' ;
+ while (i--)
+ { /* keep everything on one line, to make linenumbers correct */
+ if (*p == '\r' || *p == '\n')
+ *p = ' ' ;
+ p++ ;
+ }
+ }
pSV = newSVpvf("package %s ;\n#line %d \"%s\"\n%*.*s",
1.70.4.97 +9 -17 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.96
retrieving revision 1.70.4.97
diff -u -r1.70.4.96 -r1.70.4.97
--- test.pl 2001/11/20 15:15:41 1.70.4.96
+++ test.pl 2001/11/22 11:00:54 1.70.4.97
@@ -11,7 +11,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: test.pl,v 1.70.4.96 2001/11/20 15:15:41 richter Exp $
+# $Id: test.pl,v 1.70.4.97 2001/11/22 11:00:54 richter Exp $
#
###################################################################################
@@ -1266,24 +1266,16 @@
{
my ($loc, $file, $query, $ofile, $content, $upload, $cookieaction, $respheader) = @_ ;
-
- eval 'require LWP::UserAgent' ;
-
- $cookieaction |= '' ;
-
- if ($@)
- {
- return "LWP not installed\n" ;
- }
- eval 'use HTTP::Request::Common' ;
- if ($@)
- {
- return "HTTP::Request::Common not installed\n" ;
- }
-
+ eval 'require LWP::UserAgent' ;
+ return "LWP not installed\n" if ($@) ;
+ eval 'use HTTP::Request::Common' ;
+ return "HTTP::Request::Common not installed\n" if ($@) ;
+ eval 'require URI::URL';
+ return "URI::URL not installed\n" if ($@) ;
- $query ||= '' ;
+ $query ||= '' ;
+ $cookieaction ||= '' ;
my $ua = new LWP::UserAgent; # create a useragent to test
No revision
No revision
1.1.2.22 +2 -2 embperl/Embperl/Syntax/Attic/RTF.pm
Index: RTF.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Syntax/Attic/RTF.pm,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -u -r1.1.2.21 -r1.1.2.22
--- RTF.pm 2001/10/31 12:04:26 1.1.2.21
+++ RTF.pm 2001/11/22 11:00:54 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: RTF.pm,v 1.1.2.21 2001/10/31 12:04:26 richter Exp $
+# $Id: RTF.pm,v 1.1.2.22 2001/11/22 11:00:54 richter Exp $
#
###################################################################################
@@ -646,7 +646,7 @@
'embperl' => {
compiletimeperlcode => q[$_ep_rtf_inside++ if ($_ep_rtf_inside) ; ],
perlcodeend => '%$x%',
- compiletimeperlcodeend => q[
+ compiletimeperlcodeend => q[#!-
if ($_ep_rtf_inside)
{
$_ep_rtf_inside-- ;
No revision
No revision
1.1.2.3 +1 -0 embperl/test/cmp2/Attic/tied.htm
Index: tied.htm
===================================================================
RCS file: /home/cvs/embperl/test/cmp2/Attic/tied.htm,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -u -r1.1.2.2 -r1.1.2.3
--- tied.htm 2001/11/16 11:29:04 1.1.2.2
+++ tied.htm 2001/11/22 11:00:55 1.1.2.3
@@ -49,6 +49,7 @@
^Date:
^Server: Apache
Connection: close
+^-Transfer-Encoding:
Content-Type: text/html; charset=iso-8859-1
<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML 2.0//EN">
No revision
No revision
1.3.6.1 +3 -0 embperl/test/html/sub.htm
Index: sub.htm
===================================================================
RCS file: /home/cvs/embperl/test/html/sub.htm,v
retrieving revision 1.3
retrieving revision 1.3.6.1
diff -u -r1.3 -r1.3.6.1
--- sub.htm 1999/10/05 06:03:47 1.3
+++ sub.htm 2001/11/22 11:00:55 1.3.6.1
@@ -13,9 +13,12 @@
[!
+# Here we add a comment
+
sub Hello
{
+ # not much to do ...
return 'Hello world' ;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org