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/23 13:28:21 UTC
cvs commit: embperl epcomp.c epdat.h epmain.c eputil.c
richter 01/11/23 04:28:21
Modified: . Tag: Embperl2c epcomp.c epdat.h epmain.c eputil.c
Log:
fix double sub names in compiled code
Revision Changes Path
No revision
No revision
1.4.2.84 +3 -14 embperl/Attic/epcomp.c
Index: epcomp.c
===================================================================
RCS file: /home/cvs/embperl/Attic/epcomp.c,v
retrieving revision 1.4.2.83
retrieving revision 1.4.2.84
diff -u -r1.4.2.83 -r1.4.2.84
--- epcomp.c 2001/11/23 11:43:54 1.4.2.83
+++ epcomp.c 2001/11/23 12:28:18 1.4.2.84
@@ -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.83 2001/11/23 11:43:54 richter Exp $
+# $Id: epcomp.c,v 1.4.2.84 2001/11/23 12:28:18 richter Exp $
#
###################################################################################*/
@@ -1675,18 +1675,7 @@
lprintf (r, "Setup source code for interactive debugger\n") ;
}
- 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) ;
+ rc = EvalOnly (r, r -> pProgRun, pProg, G_SCALAR, r -> Buf.pFile -> sMainSub) ;
StringFree (&r -> pProgRun) ;
StringFree (&r -> pProgDef) ;
@@ -2152,7 +2141,7 @@
lprintf (r, "Setup source code for interactive debugger\n") ;
}
- rc = EvalOnly (r, r -> pProgRun, ppCompResult, G_SCALAR, EPMAINSUB) ;
+ rc = EvalOnly (r, r -> pProgRun, ppCompResult, G_SCALAR, r -> Buf.pFile -> sMainSub) ;
StringFree (&r -> pProgRun) ;
StringFree (&r -> pProgDef) ;
1.20.4.35 +3 -2 embperl/epdat.h
Index: epdat.h
===================================================================
RCS file: /home/cvs/embperl/epdat.h,v
retrieving revision 1.20.4.34
retrieving revision 1.20.4.35
diff -u -r1.20.4.34 -r1.20.4.35
--- epdat.h 2001/11/16 11:29:02 1.20.4.34
+++ epdat.h 2001/11/23 12:28:20 1.20.4.35
@@ -10,7 +10,7 @@
# IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
# WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
#
-# $Id: epdat.h,v 1.20.4.34 2001/11/16 11:29:02 richter Exp $
+# $Id: epdat.h,v 1.20.4.35 2001/11/23 12:28:20 richter Exp $
#
###################################################################################*/
@@ -205,6 +205,7 @@
HV * pCacheHash ; /* Hash containing CVs to precompiled subs */
+ char * sMainSub ; /* Name of sub to call */
char * sCurrPackage ; /* Package of file */
STRLEN nCurrPackage ; /* Package of file (length) */
HV * pExportHash ; /* exportable Macros */
@@ -589,6 +590,6 @@
} ;
+#define EPMAINSUB "_ep_main"
-#define EPMAINSUB "_ep_main"
1.75.4.74 +14 -7 embperl/epmain.c
Index: epmain.c
===================================================================
RCS file: /home/cvs/embperl/epmain.c,v
retrieving revision 1.75.4.73
retrieving revision 1.75.4.74
diff -u -r1.75.4.73 -r1.75.4.74
--- epmain.c 2001/11/23 10:06:47 1.75.4.73
+++ epmain.c 2001/11/23 12:28:20 1.75.4.74
@@ -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.75.4.73 2001/11/23 10:06:47 richter Exp $
+# $Id: epmain.c,v 1.75.4.74 2001/11/23 12:28:20 richter Exp $
#
###################################################################################*/
@@ -48,6 +48,7 @@
#endif
static char sDefaultPackageName [] = "HTML::Embperl::DOC::_%d" ;
+static char sDefaultSubName [] = "_ep_main_%d" ;
static char sUIDName [] = "_ID" ;
static char sSetCookie [] = "Set-Cookie" ;
@@ -2005,11 +2006,11 @@
{
hv_clear (f -> pCacheHash) ;
-#ifdef EP2
- UndefSub (r, EPMAINSUB, f -> sCurrPackage) ;
-#endif
if (r -> bDebug)
lprintf (r, "[%d]MEM: Reload %s in %s\n", r -> nPid, sSourcefile, f -> sCurrPackage) ;
+#ifdef EP2
+ UndefSub (r, f -> sMainSub, f -> sCurrPackage) ;
+#endif
f -> mtime = mtime ; /* last modification time of file */
f -> nFilesize = nFilesize ; /* size of File */
@@ -2051,9 +2052,12 @@
f -> sCurrPackage = strdup (pConf -> sPackage) ; /* Package of file */
else
{
- sprintf (txt, sDefaultPackageName, nPackNo++ ) ;
+ sprintf (txt, sDefaultPackageName, nPackNo ) ;
f -> sCurrPackage = strdup (txt) ; /* Package of file */
}
+ sprintf (txt, sDefaultSubName, nPackNo ) ;
+ f -> sMainSub = strdup (txt) ; /* Package of file */
+ nPackNo++ ;
f -> nCurrPackage = strlen (f -> sCurrPackage); /* Package of file (length) */
hv_store(pCacheHash, cache_key, cache_key_len, newRV_noinc (newSViv ((IV)f)), 0) ;
@@ -2137,7 +2141,7 @@
{
hv_clear (f -> pCacheHash) ;
#ifdef EP2
- UndefSub (pCurrReq, f -> sCurrPackage, EPMAINSUB) ;
+ UndefSub (pCurrReq, f -> sMainSub, f -> sCurrPackage) ;
#endif
f -> mtime = -1 ; /* reset last modification time of file */
@@ -2172,9 +2176,12 @@
f -> sCurrPackage = strdup (sPackage) ; /* Package of file */
else
{
- sprintf (txt, sDefaultPackageName, nPackNo++ ) ;
+ sprintf (txt, sDefaultPackageName, nPackNo ) ;
f -> sCurrPackage = strdup (txt) ; /* Package of file */
}
+ sprintf (txt, sDefaultSubName, nPackNo ) ;
+ f -> sMainSub = strdup (txt) ; /* Package of file */
+ nPackNo++ ;
f -> nCurrPackage = strlen (f -> sCurrPackage); /* Package of file (length) */
hv_store(pCacheHash, cache_key, cache_key_len, newRV_noinc (newSViv ((IV)f)), 0) ;
1.15.4.31 +2 -2 embperl/eputil.c
Index: eputil.c
===================================================================
RCS file: /home/cvs/embperl/eputil.c,v
retrieving revision 1.15.4.30
retrieving revision 1.15.4.31
diff -u -r1.15.4.30 -r1.15.4.31
--- eputil.c 2001/11/23 11:43:55 1.15.4.30
+++ eputil.c 2001/11/23 12:28:20 1.15.4.31
@@ -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.30 2001/11/23 11:43:55 richter Exp $
+# $Id: eputil.c,v 1.15.4.31 2001/11/23 12:28:20 richter Exp $
#
###################################################################################*/
@@ -1204,7 +1204,7 @@
if ((symtab = gv_stashpv ((char *)sPackage, 0)) == NULL)
return ;
- ppSV = hv_fetch (symtab, EPMAINSUB, sizeof (EPMAINSUB) - 1, 0) ;
+ ppSV = hv_fetch (symtab, "_ep_DomTree", sizeof ("_ep_DomTree") - 1, 0) ;
if (!ppSV || !*ppSV)
{
if (bDebug)
---------------------------------------------------------------------
To unsubscribe, e-mail: embperl-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: embperl-cvs-help@perl.apache.org