jyapayne/swig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(GUILE_LSTYLE_LTDLMOD, GUILE_LSTYLE_HOBBIT): Delete these

Browse source 
pre-processor macros.  These identifiers are now enum values
defined in guile.h.

(GUILE::initialize): Remove old-style cruft, no functional change.

(GUILE::emit_linkage): Now a member of class `GUILE'.
Handle `GUILE_LSTYLE_SIMPLE'.

(GUILE::close): Update call to `emit_linkage'.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@369 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Thien-Thi Nguyen 2000-04-03 15:08:30 +00:00
commit b40f21b0ef
1 changed files with 9 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

29
SWIG/Source/Modules1.1/guile.cxx
View file

@ -45,9 +45,6 @@ Guile Options (available with -guile)\n\
likely to be broken. Please use with care.\n\ likely to be broken. Please use with care.\n\
\n"; \n";
#define GUILE_LSTYLE_LTDLMOD 0 // "native" guile?
#define GUILE_LSTYLE_HOBBIT 1
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
// GUILE () // GUILE ()
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
@ -271,20 +268,7 @@ GUILE::headers (void)
void void
GUILE::initialize (void) GUILE::initialize (void)
{ {
int i;
#ifdef OLD_STYLE_WILL_GO_AWAY
if (InitNames) {
i = 0;
while (InitNames[i]) {
fprintf(f_init,"\t %s();\n",InitNames[i]);
i++;
}
}
#endif /* OLD_STYLE_WILL_GO_AWAY */
fprintf (f_init, "static void\nSWIG_init (void)\n{\n"); fprintf (f_init, "static void\nSWIG_init (void)\n{\n");
fprintf (f_init, "\tSWIG_Guile_Init();\n"); fprintf (f_init, "\tSWIG_Guile_Init();\n");
} }
@ -294,8 +278,8 @@ GUILE::initialize (void)
// Wrap things up. Close initialization function. // Wrap things up. Close initialization function.
// --------------------------------------------------------------------- // ---------------------------------------------------------------------
static void void
emit_linkage (String &module_name, int linkage) GUILE::emit_linkage (String &module_name)
{ {
String module_func (""); String module_func ("");
@ -304,15 +288,20 @@ emit_linkage (String &module_name, int linkage)
module_func.replace ("-", "_"); module_func.replace ("-", "_");
switch (linkage) { switch (linkage) {
case GUILE_LSTYLE_SIMPLE:
fprintf (f_init, "\n/* Linkage: simple */\n");
break;
case GUILE_LSTYLE_LTDLMOD: case GUILE_LSTYLE_LTDLMOD:
fprintf (f_init, "\n/* Linkage: ltdlmod */\n");
module_func.replace ("/", "_"); module_func.replace ("/", "_");
"scm_init" >> module_func; "scm_init" >> module_func;
module_func << "_module"; module_func << "_module";
/* TODO */
break; break;
case GUILE_LSTYLE_HOBBIT: case GUILE_LSTYLE_HOBBIT:
fprintf (f_init, "\n/* Linkage: hobbit */\n");
module_func.replace ("/", "_slash_"); module_func.replace ("/", "_slash_");
"scm_init_" >> module_func; "scm_init_" >> module_func;
fprintf (f_init, "\n/* Linkage: hobbit */\n");
fprintf (f_init, "SCM\n%s (void)\n{\n", module_func.get()); fprintf (f_init, "SCM\n%s (void)\n{\n", module_func.get());
{ {
String mod = ""; String mod = "";
@ -341,7 +330,7 @@ GUILE::close (void)
else else
module_name << module; module_name << module;
emit_linkage (module_name, linkage); emit_linkage (module_name);
} }
// ---------------------------------------------------------------------- // ----------------------------------------------------------------------