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

a struct/enum/union is replaced with :pointer only if

Browse source 
that slot is actually a pointer to that type.


git-svn-id: https://swig.svn.sourceforge.net/svnroot/swig/trunk@9070 626c5289-ae23-0410-ae9c-e8d60b6d4f22
This commit is contained in:
Surendra Singhi 2006-05-03 11:02:16 +00:00
commit 55290cfeb5
2 changed files with 52 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
SWIG/CHANGES.current
View file

@ -1,6 +1,17 @@
Version 1.3.29 (March 21, 2006) Version 1.3.29 (March 21, 2006)
=============================== ===============================
05/03/2006: efuzzyone
[cffi]Thanks to Luke J Crook for this idea.
- a struct/enum/union is replaced with :pointer only if
that slot is actually a pointer to that type. So,:
struct a_struct { int x; } and
struct b_struct { a_struct struct_1; };
will be converted as:
(cffi:defcstruct b_struct
(struct_1 a_struct))
- Other minor fixes in lispifying names.
04/14/2006: efuzzyone 04/14/2006: efuzzyone
[cffi] [cffi]
Thanks to Thomas Weidner for the patch. Thanks to Thomas Weidner for the patch.

56
SWIG/Source/Modules/cffi.cxx
View file

@ -458,11 +458,11 @@ int CFFI :: variableWrapper(Node *n) {
int CFFI :: typedefHandler(Node *n) { int CFFI :: typedefHandler(Node *n) {
if(generate_typedef_flag) { if(generate_typedef_flag) {
String *lisp_name = lispify_name(n,Getattr(n,"name"),"'typename");
Printf(f_cl,"\n(cffi:defctype %s %s)\n", Printf(f_cl,"\n(cffi:defctype %s %s)\n",
Getattr(n,"name"), lisp_name,
Swig_typemap_lookup_new("cin",n, "",0)); Swig_typemap_lookup_new("cin",n, "",0));
emit_export(n, lisp_name);
emit_export(n, Getattr(n,"name"));
} }
return Language::typedefHandler(n); return Language::typedefHandler(n);
} }
@ -470,11 +470,23 @@ int CFFI :: typedefHandler(Node *n) {
int CFFI :: enumDeclaration(Node *n) { int CFFI :: enumDeclaration(Node *n) {
String *name = Getattr(n, "sym:name"); String *name = Getattr(n, "sym:name");
bool slot_name_keywords; bool slot_name_keywords;
String *lisp_name;
if(name && Len(name)!=0) { if(name && Len(name)!=0) {
name = lispify_name(n, name, "'enumname"); lisp_name = lispify_name(n, name, "'enumname");
Printf(f_cl,"\n(cffi:defcenum %s",name); Printf(f_cl,"\n(cffi:defcenum %s",lisp_name);
slot_name_keywords = true; slot_name_keywords = true;
//Registering the enum name to the cin and cout typemaps
Parm *pattern = NewParm(name,NULL);
Swig_typemap_register("cin",pattern,lisp_name,NULL,NULL);
Swig_typemap_register("cout",pattern,lisp_name,NULL,NULL);
Delete(pattern);
//Registering with the kind, i.e., enum
pattern = NewParm(NewStringf("enum %s",name),NULL);
Swig_typemap_register("cin",pattern,lisp_name,NULL,NULL);
Swig_typemap_register("cout",pattern,lisp_name,NULL,NULL);
Delete(pattern);
} }
else { else {
Printf(f_cl,"\n(defanonenum %s",name); Printf(f_cl,"\n(defanonenum %s",name);
@ -500,8 +512,8 @@ int CFFI :: enumDeclaration(Node *n) {
Printf(f_cl, ")\n"); Printf(f_cl, ")\n");
// No need to export keywords // No need to export keywords
if (name && Len(name)!=0) { if (lisp_name && Len(lisp_name)!=0) {
emit_export(n, name); emit_export(n, lisp_name);
} }
else { else {
for (Node *c=firstChild(n); c; c=nextSibling(c)) for (Node *c=firstChild(n); c; c=nextSibling(c))
@ -528,13 +540,27 @@ void CFFI :: emit_struct_union(Node *n, bool un=false) {
Printf(stderr, " (name: %s)\n", name); Printf(stderr, " (name: %s)\n", name);
SWIG_exit(EXIT_FAILURE); SWIG_exit(EXIT_FAILURE);
} }
name = lispify_name(n, name, "'classname"); String *lisp_name = lispify_name(n, name, "'classname");
if(un)
Printf(f_cl,"\n(cffi:defcunion %s",name);
else
Printf(f_cl,"\n(cffi:defcstruct %s",name);
//Register the struct/union name to the cin and cout typemaps
Parm *pattern = NewParm(name,NULL);
Swig_typemap_register("cin",pattern,lisp_name,NULL,NULL);
Swig_typemap_register("cout",pattern,lisp_name,NULL,NULL);
Delete(pattern);
//Registering with the kind, i.e., struct or union
pattern = NewParm(NewStringf("%s %s",kind,name),NULL);
Swig_typemap_register("cin",pattern,lisp_name,NULL,NULL);
Swig_typemap_register("cout",pattern,lisp_name,NULL,NULL);
Delete(pattern);
if(un) {
Printf(f_cl,"\n(cffi:defcunion %s",lisp_name);
}
else
Printf(f_cl,"\n(cffi:defcstruct %s",lisp_name);
for (Node *c=firstChild(n); c; c=nextSibling(c)) { for (Node *c=firstChild(n); c; c=nextSibling(c)) {
#ifdef CFFI_DEBUG #ifdef CFFI_DEBUG
Printf(stderr, "struct/union %s\n", Getattr(c, "name")); Printf(stderr, "struct/union %s\n", Getattr(c, "name"));
@ -574,7 +600,7 @@ void CFFI :: emit_struct_union(Node *n, bool un=false) {
Printf(f_cl, ")\n"); Printf(f_cl, ")\n");
emit_export(n, name); emit_export(n, lisp_name);
for (Node *c=firstChild(n); c; c=nextSibling(c)) { for (Node *c=firstChild(n); c; c=nextSibling(c)) {
if (!Strcmp(nodeType(c), "cdecl")) { if (!Strcmp(nodeType(c), "cdecl")) {
emit_export(c, lispify_name(c, Getattr(c, "sym:name"), "'slotname")); emit_export(c, lispify_name(c, Getattr(c, "sym:name"), "'slotname"));