richter 01/11/23 03:43:55
Modified: . Tag: Embperl2c epcomp.c epprovider.c eputil.c
test.pl
Embperl/Recipe Tag: Embperl2c Embperl.pm
Log:
fix warnings
Revision Changes Path
No revision
No revision
1.4.2.83 +18 -4 embperl/Attic/epcomp.c
Index: epcomp.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcomp.c,v
retrieving revision 1.4.2.82
retrieving revision 1.4.2.83
diff -u -r1.4.2.82 -r1.4.2.83
--- epcomp.c 2001/11/23 07:50:59 1.4.2.82
+++ epcomp.c 2001/11/23 11:43:54 1.4.2.83
@@ -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.82 2001/11/23 07:50:59 richter Exp $
+# $Id: epcomp.c,v 1.4.2.83 2001/11/23 11:43:54 richter Exp $
#
###################################################################################*/
@@ -1004,7 +1004,7 @@
}
}
- if (r -> pCodeSV)
+ if (r -> pCodeSV && SvOK(r -> pCodeSV))
{
STRLEN l ;
char * p = SvPV (r -> pCodeSV, l) ;
@@ -1557,6 +1557,9 @@
STRLEN l ;
SV * pSV ;
SV * args[2] ;
+ HV * symtab ;
+ int i ;
+ char buf[256] ;
int nStep = r -> Buf.pFile -> nFilesize / 4 ;
if (nStep < 1024)
nStep = 1024 ;
@@ -1672,8 +1675,19 @@
lprintf (r, "Setup source code for interactive debugger\n") ;
}
- rc = EvalOnly (r, r -> pProgRun, pProg, G_SCALAR, EPMAINSUB) ;
-
+ if ((symtab = gv_stashpv ((char *)r -> Buf.sEvalPackage, 0)) == NULL)
+ return rcHashError ;
+
+ strcpy (buf, EPMAINSUB) ;
+ i = 0 ;
+ while (hv_exists (symtab, buf, strlen(buf)))
+ {
+ i++ ;
+ sprintf (buf, "%s%d", EPMAINSUB, i) ;
+ }
+ lprintf (r, "sub=%s\n", buf) ;
+ rc = EvalOnly (r, r -> pProgRun, pProg, G_SCALAR, buf) ;
+
StringFree (&r -> pProgRun) ;
StringFree (&r -> pProgDef) ;
1.1.2.14 +2 -2 embperl/Attic/epprovider.c
Index: epprovider.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epprovider.c,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -r1.1.2.13 -r1.1.2.14
--- epprovider.c 2001/11/16 11:29:02 1.1.2.13
+++ epprovider.c 2001/11/23 11:43:55 1.1.2.14
@@ -9,7 +9,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epprovider.c,v 1.1.2.13 2001/11/16 11:29:02 richter Exp $
+# $Id: epprovider.c,v 1.1.2.14 2001/11/23 11:43:55 richter Exp $
#
###################################################################################*/
@@ -1071,7 +1071,7 @@
if ((rc = Cache_AppendKey (r, pParam, "source", pKey)) != ok)
return rc;
- sv_catpv (pKey, "*epcompile") ;
+ sv_catpvf (pKey, "*epcompile:%s", GetHashValueStr (pParam, "package", "")) ;
return ok ;
}
1.15.4.30 +2 -2 embperl/eputil.c
Index: eputil.c
===================================================================
RCS file: /home/cvs/embperl/eputil.c,v
retrieving revision 1.15.4.29
retrieving revision 1.15.4.30
diff -u -r1.15.4.29 -r1.15.4.30
--- eputil.c 2001/11/16 11:29:02 1.15.4.29
+++ eputil.c 2001/11/23 11:43:55 1.15.4.30
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: eputil.c,v 1.15.4.29 2001/11/16 11:29:02 richter Exp $
+# $Id: eputil.c,v 1.15.4.30 2001/11/23 11:43:55 richter Exp $
#
###################################################################################*/
@@ -711,7 +711,7 @@
/*EPENTRY (GetHashValueInt) ;*/
ppSV = hv_fetch(pHash, (char *)sKey, strlen (sKey), 0) ;
- if (ppSV != NULL && *ppSV)
+ if (ppSV != NULL && *ppSV && SvOK(*ppSV))
{
return SvUV ((*ppSV)) ;
}
1.70.4.100 +4 -2 embperl/test.pl
Index: test.pl
===================================================================
RCS file: /home/cvs/embperl/test.pl,v
retrieving revision 1.70.4.99
retrieving revision 1.70.4.100
diff -u -r1.70.4.99 -r1.70.4.100
--- test.pl 2001/11/23 07:50:59 1.70.4.99
+++ test.pl 2001/11/23 11:43:55 1.70.4.100
@@ -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.99 2001/11/23 07:50:59 richter Exp $
+# $Id: test.pl,v 1.70.4.100 2001/11/23 11:43:55 richter Exp $
#
###################################################################################
@@ -1971,7 +1971,9 @@
print "ok\n" unless ($err) ;
}
- foreach $src ('EmbperlObject/epopage1.htm',
'EmbperlObject/sub/epopage2.htm', 'EmbperlObject/obj/epoobj3.htm')
+ foreach $src ('EmbperlObject/epopage1.htm',
'EmbperlObject/sub/epopage2.htm', 'EmbperlObject/obj/epoobj3.htm',
+ 'EmbperlObject/sub/epobless.htm',
'EmbperlObject/sub/epobless.htm', 'EmbperlObject/sub/epobless2.htm',
'EmbperlObject/sub/epobless2.htm',
+ , 'EmbperlObject/sub/epobless3.htm',
'EmbperlObject/sub/epobless3.htm')
{
if ($err == 0 || $opt_ignoreerror) # && $version == 1)
{
No revision
No revision
1.1.2.6 +2 -1 embperl/Embperl/Recipe/Attic/Embperl.pm
Index: Embperl.pm
===================================================================
RCS file: /home/cvs/embperl/Embperl/Recipe/Attic/Embperl.pm,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -u -r1.1.2.5 -r1.1.2.6
--- Embperl.pm 2001/11/23 07:51:00 1.1.2.5
+++ Embperl.pm 2001/11/23 11:43:55 1.1.2.6
@@ -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.1.2.5 2001/11/23 07:51:00 richter Exp $
+# $Id: Embperl.pm,v 1.1.2.6 2001/11/23 11:43:55 richter Exp $
#
###################################################################################
@@ -72,6 +72,7 @@
'provider' =>
{
'type' => 'epcompile',
+ ($param -> {'package'}?('package' => $param -> {'package'}):()),
'source' =>
{
'cache', => 0,
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
