Removed ability to share type information by C linking

All type sharing happens through a global variable in the target language.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk/SWIG@6390 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
John Lenz 2004-10-16 18:23:59 +00:00
commit 75e462baa8
50 changed files with 204 additions and 1162 deletions

View file

@ -12,9 +12,9 @@
static int _swig_init = 0;
if (!_swig_init) {
SWIG_Guile_Init();
SWIG_Guile_RegisterTypes(swig_types, swig_types_initial);
_swig_init = 1;
}
SWIG_Guile_Init();
%}

View file

@ -36,14 +36,6 @@ extern "C" {
(char *) FUNC_NAME, (char *) msg, \
SCM_EOL, SCM_BOOL_F); else
#if defined(SWIG_NOINCLUDE)
# define SWIGSTATIC
#elif defined(SWIG_GLOBAL)
# define SWIGSTATIC
#else
# define SWIGSTATIC static
#endif
#define GH_NOT_PASSED SCM_UNDEFINED
#define GH_UNSPECIFIED SCM_UNSPECIFIED
@ -121,7 +113,7 @@ typedef struct swig_type_info {
int dummy;
} swig_type_info;
SWIGSTATIC void
static void
SWIG_Guile_RegisterTypes (swig_type_info **table,
swig_type_info **init);
@ -131,17 +123,17 @@ SWIG_Guile_RegisterTypes (swig_type_info **table,
typically used to cast pointers from derived classes to base classes in
C++). */
SWIGSTATIC void
static void
SWIG_RegisterMapping (const char *origtype, const char *newtype,
swig_converter_func cast);
/* Dynamic pointer casting. Down an inheritance hierarchy */
SWIGSTATIC swig_type_info *
static swig_type_info *
SWIG_TypeDynamicCast(swig_type_info *ty, void **ptr);
/* Register SWIG smobs with Guile. */
SWIGSTATIC void
static void
SWIG_Guile_Init();
/* Initialization function for this SWIG module; actually renamed by a
@ -150,21 +142,21 @@ SWIG_Guile_Init();
/* Get a pointer value from a smob. If there is a type-mismatch,
return nonzero; on success, return 0. */
SWIGSTATIC int
static int
SWIG_Guile_GetPtr (SCM s, void **result, swig_type_info *type);
/* Get a pointer value from a smob. If there is a type-mismatch,
signal a wrong-type-arg error for the given argument number. */
SWIGSTATIC void *
static void *
SWIG_Guile_MustGetPtr (SCM s, swig_type_info *type,
int argnum, const char *func_name);
/* Make a smob from a pointer and typeinfo. */
SWIGSTATIC SCM
static SCM
SWIG_Guile_MakePtr (void *ptr, swig_type_info *type);
/* Get arguments from an argument list */
SWIGSTATIC int
static int
SWIG_Guile_GetArgs (SCM *dest, SCM rest,
int reqargs, int optargs,
const char *procname);
@ -175,11 +167,6 @@ typedef SCM (*swig_guile_proc)();
}
#endif
/* guiledec.swg ends here */
#ifndef SWIG_NOINCLUDE
/* SWIG pointer structure */
#ifdef __cplusplus
extern "C" {
#endif
@ -197,19 +184,21 @@ struct SwigPtrType {
struct SwigCast *cast; /* List of compatible types */
};
/* Some variables */
static int SwigPtrMax = 64; /* Max entries that can be held */
/* (may be adjusted dynamically) */
static int SwigPtrN = 0; /* Current number of entries */
static int SwigPtrSort = 0; /* Status flag indicating sort */
/* Pointer table */
static SwigPtrType *SwigPtrList = 0; /* Table containing types and
struct swig_module_info {
int PtrMax;/* Max entries that can be held *//* (may be adjusted dynamically) */
int PtrN;/* Current number of entries */
int PtrSort;/* Status flag indicating sort */
SwigPtrType *PtrList; /* Table containing types and
equivalences; items will only
be appended */
static size_t *SwigPtrTbl = 0; /* Sorted indirect table; items will
be inserted */
size_t *PtrTbl;/* Sorted indirect table; items will be inserted */
unsigned long swig_tag;
};
static struct swig_module_info SwigModuleLocal = {64,0,0,0,0,0};
static struct swig_module_info *SwigModule = &SwigModuleLocal;
/* Sort comparison function */
static int
@ -217,34 +206,34 @@ swigsort (const void *data1, const void *data2)
{
size_t index1 = * (size_t *) data1;
size_t index2 = * (size_t *) data2;
return strcmp(SwigPtrList[index1].name, SwigPtrList[index2].name);
return strcmp(SwigModule->PtrList[index1].name, SwigModule->PtrList[index2].name);
}
/* Register a new datatype with the type-checker */
SWIGSTATIC size_t
static size_t
SWIG_RegisterType (const char *type, const char *prettyname)
{
int i;
/* Allocate the pointer table if necessary */
if (!SwigPtrList) {
SwigPtrList = (SwigPtrType *) malloc(SwigPtrMax*sizeof(SwigPtrType));
SwigPtrTbl = (size_t *) malloc(SwigPtrMax*sizeof(size_t));
SwigPtrN = 0;
if (!SwigModule->PtrList) {
SwigModule->PtrList = (SwigPtrType *) malloc(SwigModule->PtrMax*sizeof(SwigPtrType));
SwigModule->PtrTbl = (size_t *) malloc(SwigModule->PtrMax*sizeof(size_t));
SwigModule->PtrN = 0;
}
/* Grow the table if necessary */
if (SwigPtrN >= SwigPtrMax) {
SwigPtrMax = 2*SwigPtrMax;
SwigPtrList = (SwigPtrType *) realloc((char *) SwigPtrList,
SwigPtrMax*sizeof(SwigPtrType));
SwigPtrTbl = (size_t *) realloc((char *) SwigPtrTbl,
SwigPtrMax*sizeof(size_t));
if (SwigModule->PtrN >= SwigModule->PtrMax) {
SwigModule->PtrMax = 2*SwigModule->PtrMax;
SwigModule->PtrList = (SwigPtrType *) realloc((char *) SwigModule->PtrList,
SwigModule->PtrMax*sizeof(SwigPtrType));
SwigModule->PtrTbl = (size_t *) realloc((char *) SwigModule->PtrTbl,
SwigModule->PtrMax*sizeof(size_t));
}
/* Look up type */
for (i = 0; i < SwigPtrN; i++)
if (strcmp(SwigPtrList[i].name,type) == 0) {
for (i = 0; i < SwigModule->PtrN; i++)
if (strcmp(SwigModule->PtrList[i].name,type) == 0) {
if (prettyname!=NULL)
SwigPtrList[i].prettyname = prettyname;
SwigModule->PtrList[i].prettyname = prettyname;
return i;
}
{
@ -253,20 +242,20 @@ SWIG_RegisterType (const char *type, const char *prettyname)
#if 0
fprintf(stderr, "New type: %s\n", type);
#endif
tag = SwigPtrTbl[SwigPtrN] = SwigPtrN;
t = &SwigPtrList[tag];
tag = SwigModule->PtrTbl[SwigModule->PtrN] = SwigModule->PtrN;
t = &SwigModule->PtrList[tag];
t->name = type;
t->prettyname = prettyname;
t->tag = SwigPtrN;
t->tag = SwigModule->PtrN;
t->cast = NULL;
SwigPtrN++;
SwigPtrSort = 0;
SwigModule->PtrN++;
SwigModule->PtrSort = 0;
return tag;
}
}
/* Register two data types and their mapping with the type checker. */
SWIGSTATIC void
static void
SWIG_RegisterMapping (const char *origtype, const char *newtype,
swig_converter_func cast)
{
@ -276,7 +265,7 @@ SWIG_RegisterMapping (const char *origtype, const char *newtype,
size_t t1 = SWIG_RegisterType(newtype, NULL);
struct SwigCast *c;
/* Check for existing cast */
for (c = SwigPtrList[t].cast; c && c->type!=t1; c=c->next) /* nothing */;
for (c = SwigModule->PtrList[t].cast; c && c->type!=t1; c=c->next) /* nothing */;
if (c) {
if (cast) c->cast = cast;
}
@ -284,8 +273,8 @@ SWIG_RegisterMapping (const char *origtype, const char *newtype,
c = (struct SwigCast *) malloc(sizeof(struct SwigCast));
c->type = t1;
c->cast = cast;
c->next = SwigPtrList[t].cast;
SwigPtrList[t].cast = c;
c->next = SwigModule->PtrList[t].cast;
SwigModule->PtrList[t].cast = c;
}
}
}
@ -295,9 +284,9 @@ SWIG_RegisterMapping (const char *origtype, const char *newtype,
static void
SWIG_SortTable (void)
{
qsort ((void *) SwigPtrTbl, SwigPtrN, sizeof(size_t), swigsort);
qsort ((void *) SwigModule->PtrTbl, SwigModule->PtrN, sizeof(size_t), swigsort);
/* Indicate that everything is sorted */
SwigPtrSort = 1;
SwigModule->PtrSort = 1;
}
/* Look up pointer-type entry in table */
@ -307,16 +296,16 @@ swigcmp (const void *key, const void *data)
{
char *k = (char *) key;
size_t index = *(size_t *)data;
return strcmp(k, SwigPtrList[index].name);
return strcmp(k, SwigModule->PtrList[index].name);
}
static SwigPtrType *
SWIG_GetPtrType (const char *_t)
{
size_t *result;
if (!SwigPtrSort) SWIG_SortTable();
result = (size_t *) bsearch(_t, SwigPtrTbl, SwigPtrN, sizeof(size_t), swigcmp);
if (result!=NULL) return SwigPtrList+*result;
if (!SwigModule->PtrSort) SWIG_SortTable();
result = (size_t *) bsearch(_t, SwigModule->PtrTbl, SwigModule->PtrN, sizeof(size_t), swigcmp);
if (result!=NULL) return SwigModule->PtrList+*result;
else return NULL;
}
@ -331,7 +320,7 @@ SWIG_Cast (void *source, size_t source_type,
mapping table to figure out whether or not we can accept this
datatype. */
struct SwigCast *c;
for (c = SwigPtrList[dest_type].cast;
for (c = SwigModule->PtrList[dest_type].cast;
c && c->type!=source_type; c = c->next) /* nothing */;
if (c) {
/* Get pointer value. */
@ -351,7 +340,7 @@ SWIG_Cast (void *source, size_t source_type,
}
/* Dynamic pointer casting. Down an inheritance hierarchy */
SWIGSTATIC swig_type_info *
static swig_type_info *
SWIG_TypeDynamicCast(swig_type_info *ty, void **ptr)
{
swig_type_info *lastty = ty;
@ -365,18 +354,16 @@ SWIG_TypeDynamicCast(swig_type_info *ty, void **ptr)
/* Function for getting a pointer value */
static unsigned long swig_tag = 0;
SWIGSTATIC SCM
static SCM
SWIG_Guile_MakePtr (void *ptr, swig_type_info *type)
{
if (ptr==NULL) return SCM_EOL;
SCM_RETURN_NEWSMOB((((unsigned long)type->tag << 16) | swig_tag),
SCM_RETURN_NEWSMOB((((unsigned long)type->tag << 16) | SwigModule->swig_tag),
ptr);
}
/* Return 0 if successful. */
SWIGSTATIC int
static int
SWIG_Guile_GetPtr(SCM s, void **result, swig_type_info *type)
{
if (SCM_NULLP(s)) {
@ -384,7 +371,7 @@ SWIG_Guile_GetPtr(SCM s, void **result, swig_type_info *type)
return 0;
}
else if (SCM_NIMP(s)
&& (unsigned long) SCM_TYP16(s) == swig_tag) {
&& (unsigned long) SCM_TYP16(s) == SwigModule->swig_tag) {
if (type)
return !SWIG_Cast((void *) SCM_CDR(s),
(long) SCM_CAR(s) >> 16,
@ -397,7 +384,7 @@ SWIG_Guile_GetPtr(SCM s, void **result, swig_type_info *type)
return 1;
}
SWIGSTATIC void *
static void *
SWIG_Guile_MustGetPtr (SCM s, swig_type_info *type,
int argnum, const char *func_name)
{
@ -415,9 +402,9 @@ static int
print_swig (SCM swig_smob, SCM port, scm_print_state *pstate)
{
scm_puts((char *) "#<swig ", port);
if (SwigPtrList[(long) SCM_CAR(swig_smob) >> 16].prettyname != NULL)
scm_puts((char*) SwigPtrList[(long) SCM_CAR(swig_smob) >> 16].prettyname, port);
else scm_puts((char*) SwigPtrList[(long) SCM_CAR(swig_smob) >> 16].name, port);
if (SwigModule->PtrList[(long) SCM_CAR(swig_smob) >> 16].prettyname != NULL)
scm_puts((char*) SwigModule->PtrList[(long) SCM_CAR(swig_smob) >> 16].prettyname, port);
else scm_puts((char*) SwigModule->PtrList[(long) SCM_CAR(swig_smob) >> 16].name, port);
scm_puts((char *) " ", port);
scm_intprint((long) SCM_CDR(swig_smob), 16, port);
scm_puts((char *) ">", port);
@ -434,18 +421,27 @@ equalp_swig (SCM A, SCM B)
else return SCM_BOOL_F;
}
SWIGSTATIC void
static void
SWIG_Guile_Init (void)
{
if (swig_tag == 0) {
swig_tag = scm_make_smob_type_mfpe((char *) "swig", 0, NULL, NULL,
SCM pointer;
pointer = gh_lookup("swig_runtime_data_type_pointer");
if (pointer == SCM_UNDEFINED) {
pointer = gh_ulong2scm((unsigned long)SwigModule);
gh_define("swig_runtime_data_type_pointer", pointer);
if (SwigModule->swig_tag == 0) {
SwigModule->swig_tag = scm_make_smob_type_mfpe((char *) "swig", 0, NULL, NULL,
print_swig, equalp_swig);
}
} else {
SwigModule = (struct swig_module_info *) gh_scm2ulong(pointer);
}
}
/* Convert datatype table */
SWIGSTATIC
static
void SWIG_Guile_RegisterTypes(swig_type_info **table,
swig_type_info **init)
{
@ -460,7 +456,7 @@ void SWIG_Guile_RegisterTypes(swig_type_info **table,
}
}
SWIGSTATIC int
static int
SWIG_Guile_GetArgs (SCM *dest, SCM rest,
int reqargs, int optargs,
const char *procname)
@ -489,7 +485,3 @@ SWIG_Guile_GetArgs (SCM *dest, SCM rest,
#ifdef __cplusplus
}
#endif
/* guile.swg ends here */
#endif

View file

@ -5,7 +5,6 @@
#define SWIGGUILE_SCM
%runtime "precommon.swg"
%runtime "common.swg"
%runtime "guile_scm_run.swg"

View file

@ -48,42 +48,7 @@ typedef struct swig_guile_clientdata {
(char *) FUNC_NAME, (char *) msg, \
SCM_EOL, SCM_BOOL_F); else
#ifdef SWIG_NOINCLUDE
/* Interface helper function */
SWIGIMPORT(char *) SWIG_Guile_scm2newstr(SCM str, size_t *len);
/* Register SWIG smobs with Guile. */
SWIGIMPORT(void) SWIG_Guile_Init();
/* Get a pointer value from a smob. If there is a type-mismatch,
return nonzero; on success, return 0. */
SWIGIMPORT(int) SWIG_Guile_ConvertPtr(SCM s, void **result, swig_type_info *type, int flags);
/* Get a pointer value from a smob. If there is a type-mismatch,
signal a wrong-type-arg error for the given argument number. */
SWIGIMPORT(void *) SWIG_Guile_MustGetPtr(SCM s, swig_type_info *type, int argnum, int flags, const char *func_name);
/* Make a smob from a pointer and typeinfo. */
SWIGIMPORT(SCM) SWIG_Guile_NewPointerObj(void *ptr, swig_type_info *type, int owner);
/* Get arguments from an argument list */
SWIGIMPORT(int) SWIG_Guile_GetArgs(SCM *dest, SCM rest, int reqargs, int optargs, const char *procname);
/* Make a pointer object non-collectable */
SWIGIMPORT(void)
SWIG_Guile_MarkPointerNoncollectable(SCM s);
/* Mark a pointer object destroyed */
SWIGIMPORT(void)
SWIG_Guile_MarkPointerDestroyed(SCM s);
/* Access type and address of a pointer object. */
SWIGIMPORT(unsigned long)
SWIG_Guile_PointerAddress(SCM object);
SWIGIMPORT(swig_type_info *)
SWIG_Guile_PointerType(SCM object);
SWIGIMPORT(int)
SWIG_Guile_IsPointer(SCM object);
SWIGIMPORT(int)
SWIG_Guile_IsPointerOfType(SCM object, swig_type_info *type);
#else
SWIGRUNTIME(char *)
static char *
SWIG_Guile_scm2newstr(SCM str, size_t *len) {
#define FUNC_NAME "SWIG_Guile_scm2newstr"
char *ret;
@ -114,7 +79,7 @@ static SCM swig_symbol = SCM_EOL;
( SCM_NNULLP(x) && SCM_INSTANCEP(x) && SCM_NFALSEP(scm_slot_exists_p(x, swig_symbol)) \
? scm_slot_ref(x, swig_symbol) : (x) )
SWIGRUNTIME(SCM)
static SCM
SWIG_Guile_NewPointerObj(void *ptr, swig_type_info *type, int owner)
{
if (ptr == NULL)
@ -143,7 +108,7 @@ SWIG_Guile_NewPointerObj(void *ptr, swig_type_info *type, int owner)
}
}
SWIGRUNTIME(unsigned long)
static unsigned long
SWIG_Guile_PointerAddress(SCM object)
{
SCM smob = SWIG_Guile_GetSmob(object);
@ -156,7 +121,7 @@ SWIG_Guile_PointerAddress(SCM object)
else scm_wrong_type_arg("SWIG-Guile-PointerAddress", 1, object);
}
SWIGRUNTIME(swig_type_info *)
static swig_type_info *
SWIG_Guile_PointerType(SCM object)
{
SCM smob = SWIG_Guile_GetSmob(object);
@ -170,7 +135,7 @@ SWIG_Guile_PointerType(SCM object)
}
/* Return 0 if successful. */
SWIGRUNTIME(int)
static int
SWIG_Guile_ConvertPtr(SCM s, void **result, swig_type_info *type, int flags)
{
swig_type_info *cast;
@ -200,7 +165,7 @@ SWIG_Guile_ConvertPtr(SCM s, void **result, swig_type_info *type, int flags)
return 1;
}
SWIGRUNTIME(void *)
static inline void *
SWIG_Guile_MustGetPtr (SCM s, swig_type_info *type,
int argnum, int flags, const char *func_name)
{
@ -212,7 +177,7 @@ SWIG_Guile_MustGetPtr (SCM s, swig_type_info *type,
return result;
}
SWIGRUNTIME(int)
static inline int
SWIG_Guile_IsPointerOfType (SCM s, swig_type_info *type)
{
void *result;
@ -223,14 +188,14 @@ SWIG_Guile_IsPointerOfType (SCM s, swig_type_info *type)
else return 1;
}
SWIGRUNTIME(int)
static inline int
SWIG_Guile_IsPointer (SCM s)
{
return SWIG_Guile_IsPointerOfType (s, NULL);
}
/* Mark a pointer object non-collectable */
SWIGRUNTIME(void)
static void
SWIG_Guile_MarkPointerNoncollectable(SCM s)
{
SCM smob = SWIG_Guile_GetSmob(s);
@ -243,7 +208,7 @@ SWIG_Guile_MarkPointerNoncollectable(SCM s)
}
/* Mark a pointer object destroyed */
SWIGRUNTIME(void)
static void
SWIG_Guile_MarkPointerDestroyed(SCM s)
{
SCM smob = SWIG_Guile_GetSmob(s);
@ -339,7 +304,7 @@ ensure_smob_tag(SCM swig_module,
}
}
SWIGRUNTIME(void)
static void
SWIG_Guile_Init ()
{
SCM swig_module;
@ -386,7 +351,7 @@ SWIG_Guile_Init ()
#endif
}
SWIGRUNTIME(int)
static int
SWIG_Guile_GetArgs (SCM *dest, SCM rest,
int reqargs, int optargs,
const char *procname)
@ -412,8 +377,6 @@ SWIG_Guile_GetArgs (SCM *dest, SCM rest,
return num_args_passed;
}
#endif
#ifdef __cplusplus
}
#endif

View file

@ -1,19 +0,0 @@
/*************************************************************** -*- c -*-
* guile/precommon.swg
*
* Rename all exported symbols from common.swg, to avoid symbol
* clashes if multiple interpreters are included
*
************************************************************************/
#define SWIG_TypeRegister SWIG_Guile_TypeRegister
#define SWIG_TypeCheck SWIG_Guile_TypeCheck
#define SWIG_TypeCast SWIG_Guile_TypeCast
#define SWIG_TypeDynamicCast SWIG_Guile_TypeDynamicCast
#define SWIG_TypeName SWIG_Guile_TypeName
#define SWIG_TypePrettyName SWIG_Guile_TypePrettyName
#define SWIG_TypeQuery SWIG_Guile_TypeQuery
#define SWIG_TypeClientData SWIG_Guile_TypeClientData
#define SWIG_PackData SWIG_Guile_PackData
#define SWIG_UnpackData SWIG_Guile_UnpackData